Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 28480: Remove NtGdiCreatePalette it was a ros specfify api in win32k syscall list. It have been replace with NtGdiCreatePaletteInternal
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 21:22:27 2007 New Revision: 28480 URL: http://svn.reactos.org/svn/reactos?rev=28480&view=rev Log: Remove NtGdiCreatePalette it was a ros specfify api in win32k syscall list. It have been replace with NtGdiCreatePaletteInternal Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Thu Aug 23 21:22:27 2007 @@ -235,39 +235,10 @@ } } - return NtGdiCreatePalette((LOGPALETTE *)&Palette); -} - -HPALETTE STDCALL NtGdiCreatePalette(CONST PLOGPALETTE palette) -{ - PPALGDI PalGDI; - - HPALETTE NewPalette = PALETTE_AllocPalette( - PAL_INDEXED, - palette->palNumEntries, - (PULONG)palette->palPalEntry, - 0, 0, 0); - - if (NewPalette == NULL) - { - return NULL; - } - - PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette); - if (PalGDI != NULL) - { - PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); - PalGDI->logicalToSystem = NULL; - PALETTE_UnlockPalette(PalGDI); - } - else - { - /* FIXME - Handle PalGDI == NULL!!!! */ - DPRINT1("waring PalGDI is NULL \n"); - } - - return NewPalette; -} + return NtGdiCreatePaletteInternal((LOGPALETTE *)&Palette, Palette->palNumEntries); +} + + /* * @implemented Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c Thu Aug 23 21:22:27 2007 @@ -172,7 +172,7 @@ palPtr->palPalEntry[i].peFlags = 0; } - hpalette = NtGdiCreatePalette(palPtr); + hpalette = NtGdiCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); ExFreePool(palPtr); #ifndef NO_MAPPING Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 23 21:22:27 2007 @@ -752,7 +752,6 @@ NtGdiCopyEnhMetaFile 2 NtGdiCreateDIBitmap 6 NtGdiCreateEnhMetaFile 4 -NtGdiCreatePalette 1 NtGdiCreatePolygonRgn 3 NtGdiCreatePolyPolygonRgn 4 NtGdiCreateScalableFontResource 4

1 0

[tkreuzer] 28479: move NtGdiExtFloodFill from bitblt.c to filshap.c
by tkreuzer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: tkreuzer Date: Thu Aug 23 21:04:28 2007 New Revision: 28479 URL: http://svn.reactos.org/svn/reactos?rev=28479&view=rev Log: move NtGdiExtFloodFill from bitblt.c to filshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Thu Aug 23 21:04:28 2007 @@ -533,20 +533,6 @@ EngDeleteXlate(XlateObj); } return Ret; -} - -BOOL STDCALL -NtGdiExtFloodFill( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Color, - UINT FillType) -{ - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); - - /* lie and say we succeded */ - return TRUE; } /*********************************************************************** Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Thu Aug 23 21:04:28 2007 @@ -1659,4 +1659,18 @@ return Ret; } +BOOL STDCALL +NtGdiExtFloodFill( + HDC hDC, + INT XStart, + INT YStart, + COLORREF Color, + UINT FillType) +{ + DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); + + /* lie and say we succeded */ + return TRUE; +} + /* EOF */

1 0

[tkreuzer] 28478: - rename painting.c to bitblt.c - move NtGdi/Int(Poly)PatBlt to bitblt.c
by tkreuzer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: tkreuzer Date: Thu Aug 23 20:38:23 2007 New Revision: 28478 URL: http://svn.reactos.org/svn/reactos?rev=28478&view=rev Log: - rename painting.c to bitblt.c - move NtGdi/Int(Poly)PatBlt to bitblt.c Added: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c - copied, changed from r28476, trunk/reactos/subsystems/win32/win32k/objects/painting.c Removed: trunk/reactos/subsystems/win32/win32k/objects/painting.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Copied: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c (from r28476, trunk/reactos/subsystems/win32/win32k/objects/painting.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Thu Aug 23 20:38:23 2007 @@ -1012,3 +1012,226 @@ return Status; } +BOOL FASTCALL +IntPatBlt( + PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP, + PGDIBRUSHOBJ BrushObj) +{ + RECTL DestRect; + BITMAPOBJ *BitmapObj; + GDIBRUSHINST BrushInst; + POINTL BrushOrigin; + BOOL ret = TRUE; + + ASSERT(BrushObj); + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (BitmapObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + if (Width > 0) + { + DestRect.left = XLeft + dc->w.DCOrgX; + DestRect.right = XLeft + Width + dc->w.DCOrgX; + } + else + { + DestRect.left = XLeft + Width + 1 + dc->w.DCOrgX; + DestRect.right = XLeft + dc->w.DCOrgX + 1; + } + + if (Height > 0) + { + DestRect.top = YLeft + dc->w.DCOrgY; + DestRect.bottom = YLeft + Height + dc->w.DCOrgY; + } + else + { + DestRect.top = YLeft + Height + dc->w.DCOrgY + 1; + DestRect.bottom = YLeft + dc->w.DCOrgY + 1; + } + + IntLPtoDP(dc, (LPPOINT)&DestRect, 2); + + BrushOrigin.x = BrushObj->ptOrigin.x + dc->w.DCOrgX; + BrushOrigin.y = BrushObj->ptOrigin.y + dc->w.DCOrgY; + + IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); + + ret = IntEngBitBlt( + &BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &BrushInst.BrushObject, + &BrushOrigin, + ROP3_TO_ROP4(ROP)); + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return ret; +} + +BOOL FASTCALL +IntGdiPolyPatBlt( + HDC hDC, + DWORD dwRop, + PPATRECT pRects, + int cRects, + ULONG Reserved) +{ + int i; + PPATRECT r; + PGDIBRUSHOBJ BrushObj; + DC *dc; + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + for (r = pRects, i = 0; i < cRects; i++) + { + BrushObj = BRUSHOBJ_LockBrush(r->hBrush); + if(BrushObj != NULL) + { + IntPatBlt( + dc, + r->r.left, + r->r.top, + r->r.right, + r->r.bottom, + dwRop, + BrushObj); + BRUSHOBJ_UnlockBrush(BrushObj); + } + r++; + } + + DC_UnlockDc(dc); + + return TRUE; +} + + +BOOL STDCALL +NtGdiPatBlt( + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP) +{ + PGDIBRUSHOBJ BrushObj; + DC *dc = DC_LockDc(hDC); + BOOL ret; + + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + BrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); + if (BrushObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + DC_UnlockDc(dc); + return FALSE; + } + + ret = IntPatBlt( + dc, + XLeft, + YLeft, + Width, + Height, + ROP, + BrushObj); + + BRUSHOBJ_UnlockBrush(BrushObj); + DC_UnlockDc(dc); + + return ret; +} + +BOOL STDCALL +NtGdiPolyPatBlt( + HDC hDC, + DWORD dwRop, + IN PPOLYPATBLT pRects, + IN DWORD cRects, + IN DWORD Mode) +{ + PPATRECT rb = NULL; + NTSTATUS Status = STATUS_SUCCESS; + BOOL Ret; + + if (cRects > 0) + { + rb = ExAllocatePoolWithTag(PagedPool, sizeof(PATRECT) * cRects, TAG_PATBLT); + if (!rb) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + _SEH_TRY + { + ProbeForRead(pRects, + cRects * sizeof(PATRECT), + 1); + RtlCopyMemory(rb, + pRects, + cRects * sizeof(PATRECT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePool(rb); + SetLastNtError(Status); + return FALSE; + } + } + + Ret = IntGdiPolyPatBlt(hDC, dwRop, (PPATRECT)pRects, cRects, Mode); + + if (cRects > 0) + ExFreePool(rb); + + return Ret; +} Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Thu Aug 23 20:38:23 2007 @@ -490,130 +490,6 @@ BRUSHOBJ_UnlockBrush(BrushObject); return hBrush; -} - -BOOL FASTCALL -IntPatBlt( - PDC dc, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP, - PGDIBRUSHOBJ BrushObj) -{ - RECTL DestRect; - BITMAPOBJ *BitmapObj; - GDIBRUSHINST BrushInst; - POINTL BrushOrigin; - BOOL ret = TRUE; - - ASSERT(BrushObj); - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (BitmapObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - if (Width > 0) - { - DestRect.left = XLeft + dc->w.DCOrgX; - DestRect.right = XLeft + Width + dc->w.DCOrgX; - } - else - { - DestRect.left = XLeft + Width + 1 + dc->w.DCOrgX; - DestRect.right = XLeft + dc->w.DCOrgX + 1; - } - - if (Height > 0) - { - DestRect.top = YLeft + dc->w.DCOrgY; - DestRect.bottom = YLeft + Height + dc->w.DCOrgY; - } - else - { - DestRect.top = YLeft + Height + dc->w.DCOrgY + 1; - DestRect.bottom = YLeft + dc->w.DCOrgY + 1; - } - - IntLPtoDP(dc, (LPPOINT)&DestRect, 2); - - BrushOrigin.x = BrushObj->ptOrigin.x + dc->w.DCOrgX; - BrushOrigin.y = BrushObj->ptOrigin.y + dc->w.DCOrgY; - - IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); - - ret = IntEngBitBlt( - &BitmapObj->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &BrushInst.BrushObject, - &BrushOrigin, - ROP3_TO_ROP4(ROP)); - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return ret; -} - -BOOL FASTCALL -IntGdiPolyPatBlt( - HDC hDC, - DWORD dwRop, - PPATRECT pRects, - int cRects, - ULONG Reserved) -{ - int i; - PPATRECT r; - PGDIBRUSHOBJ BrushObj; - DC *dc; - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - for (r = pRects, i = 0; i < cRects; i++) - { - BrushObj = BRUSHOBJ_LockBrush(r->hBrush); - if(BrushObj != NULL) - { - IntPatBlt( - dc, - r->r.left, - r->r.top, - r->r.right, - r->r.bottom, - dwRop, - BrushObj); - BRUSHOBJ_UnlockBrush(BrushObj); - } - r++; - } - - DC_UnlockDc(dc); - - return TRUE; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -747,105 +623,6 @@ return TRUE; } -BOOL STDCALL -NtGdiPolyPatBlt( - HDC hDC, - DWORD dwRop, - IN PPOLYPATBLT pRects, - IN DWORD cRects, - IN DWORD Mode) -{ - PPATRECT rb = NULL; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - if (cRects > 0) - { - rb = ExAllocatePoolWithTag(PagedPool, sizeof(PATRECT) * cRects, TAG_PATBLT); - if (!rb) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - _SEH_TRY - { - ProbeForRead(pRects, - cRects * sizeof(PATRECT), - 1); - RtlCopyMemory(rb, - pRects, - cRects * sizeof(PATRECT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePool(rb); - SetLastNtError(Status); - return FALSE; - } - } - - Ret = IntGdiPolyPatBlt(hDC, dwRop, (PPATRECT)pRects, cRects, Mode); - - if (cRects > 0) - ExFreePool(rb); - - return Ret; -} - -BOOL STDCALL -NtGdiPatBlt( - HDC hDC, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP) -{ - PGDIBRUSHOBJ BrushObj; - DC *dc = DC_LockDc(hDC); - BOOL ret; - - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - BrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); - if (BrushObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - DC_UnlockDc(dc); - return FALSE; - } - - ret = IntPatBlt( - dc, - XLeft, - YLeft, - Width, - Height, - ROP, - BrushObj); - - BRUSHOBJ_UnlockBrush(BrushObj); - DC_UnlockDc(dc); - - return ret; -} - VOID FASTCALL IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color) { Removed: trunk/reactos/subsystems/win32/win32k/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/painting.c (removed) @@ -1,1014 +1,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: bitmaps.c 28300 2007-08-12 15:20:09Z tkreuzer $ */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - - - -BOOL STDCALL -NtGdiAlphaBlend( - HDC hDCDest, - LONG XOriginDest, - LONG YOriginDest, - LONG WidthDest, - LONG HeightDest, - HDC hDCSrc, - LONG XOriginSrc, - LONG YOriginSrc, - LONG WidthSrc, - LONG HeightSrc, - BLENDFUNCTION BlendFunc, - HANDLE hcmXform) -{ - PDC DCDest = NULL; - PDC DCSrc = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; - RECTL DestRect, SourceRect; - BOOL Status; - XLATEOBJ *XlateObj; - BLENDOBJ BlendObj; - HPALETTE SourcePalette = 0, DestPalette = 0; - BlendObj.BlendFunction = BlendFunc; - - DCDest = DC_LockDc(hDCDest); - if (NULL == DCDest) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (hDCSrc != hDCDest) - { - DCSrc = DC_LockDc(hDCSrc); - if (NULL == DCSrc) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - else - { - DCSrc = DCDest; - } - - /* Offset the destination and source by the origin of their DCs. */ - XOriginDest += DCDest->w.DCOrgX; - YOriginDest += DCDest->w.DCOrgY; - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; - - DestRect.left = XOriginDest; - DestRect.top = YOriginDest; - DestRect.right = XOriginDest + WidthDest; - DestRect.bottom = YOriginDest + HeightDest; - - SourceRect.left = XOriginSrc; - SourceRect.top = YOriginSrc; - SourceRect.right = XOriginSrc + WidthSrc; - SourceRect.bottom = YOriginSrc + HeightSrc; - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - if (DCSrc->w.hBitmap == DCDest->w.hBitmap) - BitmapSrc = BitmapDest; - else - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - - /* Create the XLATEOBJ. */ - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { - XlateObj = NULL; - } - else - { - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (BitmapSrc != BitmapDest) - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCDest); - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - - /* Perform the alpha blend operation */ - Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, &BlendObj); - - if (XlateObj != NULL) - EngDeleteXlate(XlateObj); - - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (BitmapSrc != BitmapDest) - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCDest); - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - - return Status; -} - -BOOL STDCALL -NtGdiBitBlt( - HDC hDCDest, - INT XDest, - INT YDest, - INT Width, - INT Height, - HDC hDCSrc, - INT XSrc, - INT YSrc, - DWORD ROP, - IN DWORD crBackColor, - IN FLONG fl) -{ - PDC DCDest = NULL; - PDC DCSrc = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; - RECTL DestRect; - POINTL SourcePoint, BrushOrigin; - BOOL Status; - XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; - GDIBRUSHINST BrushInst; - BOOL UsesSource = ROP3_USES_SOURCE(ROP); - BOOL UsesPattern = ROP3_USES_PATTERN(ROP); - - DCDest = DC_LockDc(hDCDest); - if (NULL == DCDest) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (UsesSource) - { - if (hDCSrc != hDCDest) - { - DCSrc = DC_LockDc(hDCSrc); - if (NULL == DCSrc) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - else - { - DCSrc = DCDest; - } - } - else - { - DCSrc = NULL; - } - - /* Offset the destination and source by the origin of their DCs. */ - XDest += DCDest->w.DCOrgX; - YDest += DCDest->w.DCOrgY; - if (UsesSource) - { - XSrc += DCSrc->w.DCOrgX; - YSrc += DCSrc->w.DCOrgY; - } - - DestRect.left = XDest; - DestRect.top = YDest; - DestRect.right = XDest+Width; - DestRect.bottom = YDest+Height; - - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); - - SourcePoint.x = XSrc; - SourcePoint.y = YSrc; - - BrushOrigin.x = 0; - BrushOrigin.y = 0; - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - if (UsesSource) - { - if (DCSrc->w.hBitmap == DCDest->w.hBitmap) - BitmapSrc = BitmapDest; - else - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - } - else - { - BitmapSrc = NULL; - } - - if (UsesPattern) - { - BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); - if (NULL == BrushObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); - IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); - } - else - { - BrushObj = NULL; - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { - XlateObj = NULL; - } - else - { - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - if(BrushObj != NULL) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - } - - /* Perform the bitblt operation */ - Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, - DCDest->CombinedClip, XlateObj, &DestRect, - &SourcePoint, NULL, - BrushObj ? &BrushInst.BrushObject : NULL, - &BrushOrigin, ROP3_TO_ROP4(ROP)); - - if (UsesSource && XlateObj != NULL) - EngDeleteXlate(XlateObj); - - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if (UsesSource && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - if (BrushObj != NULL) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - - return Status; -} - -BOOL STDCALL -NtGdiTransparentBlt( - HDC hdcDst, - INT xDst, - INT yDst, - INT cxDst, - INT cyDst, - HDC hdcSrc, - INT xSrc, - INT ySrc, - INT cxSrc, - INT cySrc, - COLORREF TransColor) -{ - PDC DCDest, DCSrc; - RECTL rcDest, rcSrc; - BITMAPOBJ *BitmapDest, *BitmapSrc; - XLATEOBJ *XlateObj; - HPALETTE SourcePalette = 0, DestPalette = 0; - PPALGDI PalDestGDI, PalSourceGDI; - USHORT PalDestMode, PalSrcMode; - ULONG TransparentColor = 0; - BOOL Ret = FALSE; - - if(!(DCDest = DC_LockDc(hdcDst))) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcDst); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if((hdcDst != hdcSrc) && !(DCSrc = DC_LockDc(hdcSrc))) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if(hdcDst == hdcSrc) - { - DCSrc = DCDest; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - if(hdcDst != hdcSrc) - { - DC_UnlockDc(DCDest); - } - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - /* Offset positions */ - xDst += DCDest->w.DCOrgX; - yDst += DCDest->w.DCOrgY; - xSrc += DCSrc->w.DCOrgX; - ySrc += DCSrc->w.DCOrgY; - - if(DCDest->w.hPalette) - DestPalette = DCDest->w.hPalette; - - if(DCSrc->w.hPalette) - SourcePalette = DCSrc->w.hPalette; - - if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if((DestPalette != SourcePalette) && !(PalDestGDI = PALETTE_LockPalette(DestPalette))) - { - PALETTE_UnlockPalette(PalSourceGDI); - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if(DestPalette != SourcePalette) - { - PalDestMode = PalDestGDI->Mode; - PalSrcMode = PalSourceGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - } - else - { - PalDestMode = PalSrcMode = PalSourceGDI->Mode; - } - PALETTE_UnlockPalette(PalSourceGDI); - - /* Translate Transparent (RGB) Color to the source palette */ - if((XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalSrcMode, PAL_RGB, SourcePalette, NULL))) - { - TransparentColor = XLATEOBJ_iXlate(XlateObj, (ULONG)TransColor); - EngDeleteXlate(XlateObj); - } - - /* Create the XLATE object to convert colors between source and destination */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette); - - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - /* FIXME - BitmapDest can be NULL!!!! Don't assert here! */ - ASSERT(BitmapDest); - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - /* FIXME - BitmapSrc can be NULL!!!! Don't assert here! */ - ASSERT(BitmapSrc); - - rcDest.left = xDst; - rcDest.top = yDst; - rcDest.right = rcDest.left + cxDst; - rcDest.bottom = rcDest.top + cyDst; - rcSrc.left = xSrc; - rcSrc.top = ySrc; - rcSrc.right = rcSrc.left + cxSrc; - rcSrc.bottom = rcSrc.top + cySrc; - - if((cxDst != cxSrc) || (cyDst != cySrc)) - { - DPRINT1("TransparentBlt() does not support stretching at the moment!\n"); - goto done; - } - - Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc, - TransparentColor, 0); - -done: - BITMAPOBJ_UnlockBitmap(BitmapDest); - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCSrc); - if(hdcDst != hdcSrc) - { - DC_UnlockDc(DCDest); - } - if(XlateObj) - { - EngDeleteXlate(XlateObj); - } - return Ret; -} - -BOOL STDCALL -NtGdiExtFloodFill( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Color, - UINT FillType) -{ - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); - - /* lie and say we succeded */ - return TRUE; -} - -/*********************************************************************** - * MaskBlt - * Ported from WINE by sedwards 11-4-03 - * - * Someone thought it would be faster to do it here and then switch back - * to GDI32. I dunno. Write a test and let me know. - */ - -static __inline BYTE -SwapROP3_SrcDst(BYTE bRop3) -{ - return (bRop3 & 0x99) | ((bRop3 & 0x22) << 1) | ((bRop3 & 0x44) >> 1); -} - -#define FRGND_ROP3(ROP4) ((ROP4) & 0x00FFFFFF) -#define BKGND_ROP3(ROP4) (ROP3Table[(SwapROP3_SrcDst((ROP4)>>24)) & 0xFF]) -#define DSTCOPY 0x00AA0029 -#define DSTERASE 0x00220326 /* dest = dest & (~src) : DSna */ - -BOOL STDCALL -NtGdiMaskBlt ( - HDC hdcDest, INT nXDest, INT nYDest, - INT nWidth, INT nHeight, HDC hdcSrc, - INT nXSrc, INT nYSrc, HBITMAP hbmMask, - INT xMask, INT yMask, DWORD dwRop, - IN DWORD crBackColor) -{ - HBITMAP hOldMaskBitmap, hBitmap2, hOldBitmap2, hBitmap3, hOldBitmap3; - HDC hDCMask, hDC1, hDC2; - static const DWORD ROP3Table[256] = - { - 0x00000042, 0x00010289, - 0x00020C89, 0x000300AA, - 0x00040C88, 0x000500A9, - 0x00060865, 0x000702C5, - 0x00080F08, 0x00090245, - 0x000A0329, 0x000B0B2A, - 0x000C0324, 0x000D0B25, - 0x000E08A5, 0x000F0001, - 0x00100C85, 0x001100A6, - 0x00120868, 0x001302C8, - 0x00140869, 0x001502C9, - 0x00165CCA, 0x00171D54, - 0x00180D59, 0x00191CC8, - 0x001A06C5, 0x001B0768, - 0x001C06CA, 0x001D0766, - 0x001E01A5, 0x001F0385, - 0x00200F09, 0x00210248, - 0x00220326, 0x00230B24, - 0x00240D55, 0x00251CC5, - 0x002606C8, 0x00271868, - 0x00280369, 0x002916CA, - 0x002A0CC9, 0x002B1D58, - 0x002C0784, 0x002D060A, - 0x002E064A, 0x002F0E2A, - 0x0030032A, 0x00310B28, - 0x00320688, 0x00330008, - 0x003406C4, 0x00351864, - 0x003601A8, 0x00370388, - 0x0038078A, 0x00390604, - 0x003A0644, 0x003B0E24, - 0x003C004A, 0x003D18A4, - 0x003E1B24, 0x003F00EA, - 0x00400F0A, 0x00410249, - 0x00420D5D, 0x00431CC4, - 0x00440328, 0x00450B29, - 0x004606C6, 0x0047076A, - 0x00480368, 0x004916C5, - 0x004A0789, 0x004B0605, - 0x004C0CC8, 0x004D1954, - 0x004E0645, 0x004F0E25, - 0x00500325, 0x00510B26, - 0x005206C9, 0x00530764, - 0x005408A9, 0x00550009, - 0x005601A9, 0x00570389, - 0x00580785, 0x00590609, - 0x005A0049, 0x005B18A9, - 0x005C0649, 0x005D0E29, - 0x005E1B29, 0x005F00E9, - 0x00600365, 0x006116C6, - 0x00620786, 0x00630608, - 0x00640788, 0x00650606, - 0x00660046, 0x006718A8, - 0x006858A6, 0x00690145, - 0x006A01E9, 0x006B178A, - 0x006C01E8, 0x006D1785, - 0x006E1E28, 0x006F0C65, - 0x00700CC5, 0x00711D5C, - 0x00720648, 0x00730E28, - 0x00740646, 0x00750E26, - 0x00761B28, 0x007700E6, - 0x007801E5, 0x00791786, - 0x007A1E29, 0x007B0C68, - 0x007C1E24, 0x007D0C69, - 0x007E0955, 0x007F03C9, - 0x008003E9, 0x00810975, - 0x00820C49, 0x00831E04, - 0x00840C48, 0x00851E05, - 0x008617A6, 0x008701C5, - 0x008800C6, 0x00891B08, - 0x008A0E06, 0x008B0666, - 0x008C0E08, 0x008D0668, - 0x008E1D7C, 0x008F0CE5, - 0x00900C45, 0x00911E08, - 0x009217A9, 0x009301C4, - 0x009417AA, 0x009501C9, - 0x00960169, 0x0097588A, - 0x00981888, 0x00990066, - 0x009A0709, 0x009B07A8, - 0x009C0704, 0x009D07A6, - 0x009E16E6, 0x009F0345, - 0x00A000C9, 0x00A11B05, - 0x00A20E09, 0x00A30669, - 0x00A41885, 0x00A50065, - 0x00A60706, 0x00A707A5, - 0x00A803A9, 0x00A90189, - 0x00AA0029, 0x00AB0889, - 0x00AC0744, 0x00AD06E9, - 0x00AE0B06, 0x00AF0229, - 0x00B00E05, 0x00B10665, - 0x00B21974, 0x00B30CE8, - 0x00B4070A, 0x00B507A9, - 0x00B616E9, 0x00B70348, - 0x00B8074A, 0x00B906E6, - 0x00BA0B09, 0x00BB0226, - 0x00BC1CE4, 0x00BD0D7D, - 0x00BE0269, 0x00BF08C9, - 0x00C000CA, 0x00C11B04, - 0x00C21884, 0x00C3006A, - 0x00C40E04, 0x00C50664, - 0x00C60708, 0x00C707AA, - 0x00C803A8, 0x00C90184, - 0x00CA0749, 0x00CB06E4, - 0x00CC0020, 0x00CD0888, - 0x00CE0B08, 0x00CF0224, - 0x00D00E0A, 0x00D1066A, - 0x00D20705, 0x00D307A4, - 0x00D41D78, 0x00D50CE9, - 0x00D616EA, 0x00D70349, - 0x00D80745, 0x00D906E8, - 0x00DA1CE9, 0x00DB0D75, - 0x00DC0B04, 0x00DD0228, - 0x00DE0268, 0x00DF08C8, - 0x00E003A5, 0x00E10185, - 0x00E20746, 0x00E306EA, - 0x00E40748, 0x00E506E5, - 0x00E61CE8, 0x00E70D79, - 0x00E81D74, 0x00E95CE6, - 0x00EA02E9, 0x00EB0849, - 0x00EC02E8, 0x00ED0848, - 0x00EE0086, 0x00EF0A08, - 0x00F00021, 0x00F10885, - 0x00F20B05, 0x00F3022A, - 0x00F40B0A, 0x00F50225, - 0x00F60265, 0x00F708C5, - 0x00F802E5, 0x00F90845, - 0x00FA0089, 0x00FB0A09, - 0x00FC008A, 0x00FD0A0A, - 0x00FE02A9, 0x00FF0062, - }; - - if (!hbmMask) - return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0, 0); - - /* 1. make mask bitmap's dc */ - hDCMask = NtGdiCreateCompatibleDC(hdcDest); - hOldMaskBitmap = (HBITMAP)NtGdiSelectObject(hDCMask, hbmMask); - - /* 2. make masked Background bitmap */ - - /* 2.1 make bitmap */ - hDC1 = NtGdiCreateCompatibleDC(hdcDest); - hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap2 = (HBITMAP)NtGdiSelectObject(hDC1, hBitmap2); - - /* 2.2 draw dest bitmap and mask */ - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0); - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, BKGND_ROP3(dwRop), 0, 0); - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, DSTERASE, 0, 0); - - /* 3. make masked Foreground bitmap */ - - /* 3.1 make bitmap */ - hDC2 = NtGdiCreateCompatibleDC(hdcDest); - hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap3 = (HBITMAP)NtGdiSelectObject(hDC2, hBitmap3); - - /* 3.2 draw src bitmap and mask */ - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0); - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0,0); - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, SRCAND, 0, 0); - - /* 4. combine two bitmap and copy it to hdcDest */ - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDC2, 0, 0, SRCPAINT, 0, 0); - NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY, 0, 0); - - /* 5. restore all object */ - NtGdiSelectObject(hDCMask, hOldMaskBitmap); - NtGdiSelectObject(hDC1, hOldBitmap2); - NtGdiSelectObject(hDC2, hOldBitmap3); - - /* 6. delete all temp object */ - NtGdiDeleteObject(hBitmap2); - NtGdiDeleteObject(hBitmap3); - - NtGdiDeleteObjectApp(hDC1); - NtGdiDeleteObjectApp(hDC2); - NtGdiDeleteObjectApp(hDCMask); - - return TRUE; -} - -BOOL -APIENTRY -NtGdiPlgBlt( - IN HDC hdcTrg, - IN LPPOINT pptlTrg, - IN HDC hdcSrc, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN HBITMAP hbmMask, - IN INT xMask, - IN INT yMask, - IN DWORD crBackColor) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL STDCALL -NtGdiStretchBlt( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - DWORD ROP, - IN DWORD dwBackColor) -{ - PDC DCDest = NULL; - PDC DCSrc = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; - RECTL DestRect; - RECTL SourceRect; - BOOL Status; - XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; - BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); - BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000); - - if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - DCDest = DC_LockDc(hDCDest); - if (NULL == DCDest) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (UsesSource) - { - if (hDCSrc != hDCDest) - { - DCSrc = DC_LockDc(hDCSrc); - if (NULL == DCSrc) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - else - { - DCSrc = DCDest; - } - } - else - { - DCSrc = NULL; - } - - /* Offset the destination and source by the origin of their DCs. */ - XOriginDest += DCDest->w.DCOrgX; - YOriginDest += DCDest->w.DCOrgY; - if (UsesSource) - { - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; - } - - DestRect.left = XOriginDest; - DestRect.top = YOriginDest; - DestRect.right = XOriginDest+WidthDest; - DestRect.bottom = YOriginDest+HeightDest; - - SourceRect.left = XOriginSrc; - SourceRect.top = YOriginSrc; - SourceRect.right = XOriginSrc+WidthSrc; - SourceRect.bottom = YOriginSrc+HeightSrc; - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - if (UsesSource) - { - if (DCSrc->w.hBitmap == DCDest->w.hBitmap) - BitmapSrc = BitmapDest; - else - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - } - else - { - BitmapSrc = NULL; - } - - if ( UsesSource ) - { - int sw = BitmapSrc->SurfObj.sizlBitmap.cx; - int sh = BitmapSrc->SurfObj.sizlBitmap.cy; - if ( SourceRect.left < 0 ) - { - DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right)/abs(SourceRect.right-SourceRect.left); - SourceRect.left = 0; - } - if ( SourceRect.top < 0 ) - { - DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom)/abs(SourceRect.bottom-SourceRect.top); - SourceRect.top = 0; - } - if ( SourceRect.right < -1 ) - { - DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * (-1-SourceRect.left)/abs(SourceRect.right-SourceRect.left); - SourceRect.right = -1; - } - if ( SourceRect.bottom < -1 ) - { - DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * (-1-SourceRect.top)/abs(SourceRect.bottom-SourceRect.top); - SourceRect.bottom = -1; - } - if ( SourceRect.right > sw ) - { - DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * abs(sw-SourceRect.left) / abs(SourceRect.right-SourceRect.left); - SourceRect.right = sw; - } - if ( SourceRect.bottom > sh ) - { - DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * abs(sh-SourceRect.top) / abs(SourceRect.bottom-SourceRect.top); - SourceRect.bottom = sh; - } - sw--; - sh--; - if ( SourceRect.left > sw ) - { - DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right-sw) / abs(SourceRect.right-SourceRect.left); - SourceRect.left = 0; - } - if ( SourceRect.top > sh ) - { - DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom-sh) / abs(SourceRect.bottom-SourceRect.top); - SourceRect.top = 0; - } - if (0 == (DestRect.right-DestRect.left) || 0 == (DestRect.bottom-DestRect.top) || 0 == (SourceRect.right-SourceRect.left) || 0 == (SourceRect.bottom-SourceRect.top)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - Status = FALSE; - goto failed; - } - } - - if (UsesPattern) - { - BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); - if (NULL == BrushObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - } - else - { - BrushObj = NULL; - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; - - /* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - - /* Perform the bitblt operation */ - Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - NULL, DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, NULL, NULL, NULL, - COLORONCOLOR); - - if (UsesSource) - EngDeleteXlate(XlateObj); - if (UsesPattern) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } -failed: - if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - - return Status; -} - Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Thu Aug 23 20:38:23 2007 @@ -134,6 +134,7 @@ <directory name="objects"> <file>arc.c</file> <file>bezier.c</file> + <file>bitblt.c</file> <file>bitmaps.c</file> <file>brush.c</file> <file>cliprgn.c</file> @@ -147,7 +148,6 @@ <file>icm.c</file> <file>line.c</file> <file>metafile.c</file> - <file>painting.c</file> <file>paintobj.c</file> <file>palobj.c</file> <file>path.c</file>

1 0

[greatlrd] 28477: Fix : CreatePalette@4 calling NtGdiCreatePaletteInternal
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 20:19:51 2007 New Revision: 28477 URL: http://svn.reactos.org/svn/reactos?rev=28477&view=rev Log: Fix : CreatePalette@4 calling NtGdiCreatePaletteInternal Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 20:19:51 2007 @@ -3,7 +3,6 @@ ; gdi32.def ; ; ReactOS Operating System -; ; From Anders Norlander's w32api-0.1.5 gdi32.def. ; LIBRARY gdi32.dll @@ -47,6 +46,7 @@ CopyMetaFileW@8 CreateBitmap@20 CreateBitmapIndirect@4 +CreateBrushIndirect@4 CreateColorSpaceA@4 CreateColorSpaceW@4 CreateCompatibleBitmap@12 @@ -66,13 +66,6 @@ CreateFontIndirectA@4 CreateFontIndirectExA@4 CreateFontIndirectExW@4 - -ClearBitmapAttributes@8 -ClearBrushAttributes@8 -CopyMetaFileA@8 -CopyMetaFileW@8 -CreateBrushIndirect@4 -CreateDIBSection@24 CreateFontIndirectW@4 CreateFontW@56 CreateHalftonePalette@4=NtGdiCreateHalftonePalette@4 @@ -81,8 +74,11 @@ CreateICW@16 CreateMetaFileA@4 CreateMetaFileW@4 -CreatePalette@4=NtGdiCreatePalette@4 +CreatePalette@4 CreatePatternBrush@4 + +ClearBitmapAttributes@8 +ClearBrushAttributes@8 CreatePen@12 CreatePenIndirect@4 CreatePolyPolygonRgn@16=NtGdiCreatePolyPolygonRgn@16 Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Thu Aug 23 20:19:51 2007 @@ -11,6 +11,13 @@ const PALETTEENTRY *ppe) { return NtGdiDoPalette(hpal, iStartIndex, cEntries, (PALETTEENTRY*)ppe, GdiPalAnimate, TRUE); +} + +HPALETTE +WINAPI +CreatePalette(CONST LOGPALETTE * plpal) +{ + return NtGdiCreatePaletteInternal((LPLOGPALETTE)plpal, plpal->palNumEntries); } UINT

1 0

[greatlrd] 28476: fast implementions of NtGdiCreatePaletteInternal it is base on NtGdiCreatePalette
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 19:36:20 2007 New Revision: 28476 URL: http://svn.reactos.org/svn/reactos?rev=28476&view=rev Log: fast implementions of NtGdiCreatePaletteInternal it is base on NtGdiCreatePalette Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Thu Aug 23 19:36:20 2007 @@ -269,6 +269,42 @@ return NewPalette; } +/* + * @implemented + */ +HPALETTE STDCALL +NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries ) +{ + PPALGDI PalGDI; + HPALETTE NewPalette; + + pLogPal->palNumEntries = cEntries; + NewPalette = PALETTE_AllocPalette( PAL_INDEXED, + cEntries, + (PULONG)pLogPal->palPalEntry, + 0, 0, 0); + + if (NewPalette == NULL) + { + return NULL; + } + + PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette); + if (PalGDI != NULL) + { + PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); + PalGDI->logicalToSystem = NULL; + PALETTE_UnlockPalette(PalGDI); + } + else + { + /* FIXME - Handle PalGDI == NULL!!!! */ + DPRINT1("waring PalGDI is NULL \n"); + } + return NewPalette; +} + + BOOL STDCALL NtGdiGetColorAdjustment(HDC hDC, LPCOLORADJUSTMENT ca) { Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 23 19:36:20 2007 @@ -44,7 +44,7 @@ NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 # NtGdiCreateMetafileDC 1 -# NtGdiCreatePaletteInternal 2 +NtGdiCreatePaletteInternal 2 NtGdiCreatePatternBrushInternal 3 NtGdiCreatePen 4 NtGdiCreateRectRgn 4

1 0

[gedmurphy] 28475: odd, this doesn't fail on my machine but it does on the buildserver
by gedmurphy＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: gedmurphy Date: Thu Aug 23 19:30:49 2007 New Revision: 28475 URL: http://svn.reactos.org/svn/reactos?rev=28475&view=rev Log: odd, this doesn't fail on my machine but it does on the buildserver Modified: trunk/reactos/base/applications/mscutils/servman/reg.c Modified: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (original) +++ trunk/reactos/base/applications/mscutils/servman/reg.c Thu Aug 23 19:30:49 2007 @@ -103,4 +103,4 @@ } return lpDescription; -} +}

1 0

[gedmurphy] 28474: add new file to rbuild file and fix gcc complaints
by gedmurphy＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: gedmurphy Date: Thu Aug 23 19:23:10 2007 New Revision: 28474 URL: http://svn.reactos.org/svn/reactos?rev=28474&view=rev Log: add new file to rbuild file and fix gcc complaints Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/servman.rbuild Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Thu Aug 23 19:23:10 2007 @@ -125,7 +125,7 @@ (LPARAM)Info->PropSheet->lpDisplayName); /* set the description */ - if (Info->PropSheet->lpDescription = GetDescription(Info->CurrentService->lpServiceName)) + if ((Info->PropSheet->lpDescription = GetDescription(Info->CurrentService->lpServiceName))) { SendDlgItemMessage(Info->PropSheet->hwndGenDlg, IDC_DESCRIPTION, @@ -135,7 +135,7 @@ } /* set the executable path */ - if (Info->PropSheet->lpPathToExe = GetExecutablePath(Info)) + if ((Info->PropSheet->lpPathToExe = GetExecutablePath(Info))) { SendDlgItemMessage(Info->PropSheet->hwndGenDlg, IDC_EXEPATH, Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Thu Aug 23 19:23:10 2007 @@ -153,7 +153,7 @@ lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); /* set the description */ - if (lpDescription = GetDescription(Info->pServiceStatus[Index].lpServiceName)) + if ((lpDescription = GetDescription(Info->pServiceStatus[Index].lpServiceName))) { lvItem.pszText = lpDescription; lvItem.iSubItem = 1; Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Thu Aug 23 19:23:10 2007 @@ -25,6 +25,7 @@ <file>progress.c</file> <file>propsheet.c</file> <file>query.c</file> + <file>reg.c</file> <file>servman.c</file> <file>start.c</file> <file>stop.c</file>

1 0

[greatlrd] 28473: Remove redirect of CreateDIBitmap@24 to NtGdiCreateDIBitmap@24, and create stub for it. we need do some stuff in user mode Fix : CreateDiscardableBitmap shall be call on CreateCompatibleBitmap not the NtGdiCreateCompatibleBitmap, for we need do some thing in user mode Fix : CreateEllipticRgnIndirect it crash now, if the param is NULL, that goes same for all windows NT I tested
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 19:03:13 2007 New Revision: 28473 URL: http://svn.reactos.org/svn/reactos?rev=28473&view=rev Log: Remove redirect of CreateDIBitmap@24 to NtGdiCreateDIBitmap@24, and create stub for it. we need do some stuff in user mode Fix : CreateDiscardableBitmap shall be call on CreateCompatibleBitmap not the NtGdiCreateCompatibleBitmap, for we need do some thing in user mode Fix : CreateEllipticRgnIndirect it crash now, if the param is NULL, that goes same for all windows NT I tested Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 19:03:13 2007 @@ -56,14 +56,7 @@ CreateDIBPatternBrush@8 CreateDIBPatternBrushPt@8 CreateDIBSection@24 - -ClearBitmapAttributes@8 -ClearBrushAttributes@8 -CopyMetaFileA@8 -CopyMetaFileW@8 -CreateBrushIndirect@4 -CreateDIBSection@24 -CreateDIBitmap@24=NtGdiCreateDIBitmap@24 +CreateDIBitmap@24 CreateDiscardableBitmap@12 CreateEllipticRgn@16=NtGdiCreateEllipticRgn@16 CreateEllipticRgnIndirect@4 @@ -73,6 +66,13 @@ CreateFontIndirectA@4 CreateFontIndirectExA@4 CreateFontIndirectExW@4 + +ClearBitmapAttributes@8 +ClearBrushAttributes@8 +CopyMetaFileA@8 +CopyMetaFileW@8 +CreateBrushIndirect@4 +CreateDIBSection@24 CreateFontIndirectW@4 CreateFontW@56 CreateHalftonePalette@4=NtGdiCreateHalftonePalette@4 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 (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 23 19:03:13 2007 @@ -2432,6 +2432,18 @@ return 0; } + +HBITMAP +STDCALL +CreateDIBitmap(HDC + hDc, const BITMAPINFOHEADER *Header, + DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, + UINT ColorUse) +{ + /* FIMXE we need do more thing in user mode */ + return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); +} + /* * @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 (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c Thu Aug 23 19:03:13 2007 @@ -135,7 +135,7 @@ INT Width, INT Height) { - return NtGdiCreateCompatibleBitmap(hDC, Width, Height); + return CreateCompatibleBitmap(hDC, Width, Height); } Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Thu Aug 23 19:03:13 2007 @@ -56,11 +56,9 @@ const RECT *prc ) { - if (prc) - { - return NtGdiCreateEllipticRgn(prc->left, prc->top, prc->right, prc->bottom); - } - return NULL; + /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ + return NtGdiCreateEllipticRgn(prc->left, prc->top, prc->right, prc->bottom); + } HRGN

1 0

[gedmurphy] 28472: simplify some code
by gedmurphy＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: gedmurphy Date: Thu Aug 23 18:57:44 2007 New Revision: 28472 URL: http://svn.reactos.org/svn/reactos?rev=28472&view=rev Log: simplify some code Added: trunk/reactos/base/applications/mscutils/servman/reg.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/query.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Thu Aug 23 18:57:44 2007 @@ -304,6 +304,58 @@ } +static VOID +InitListViewImage(PMAIN_WND_INFO Info) +{ + HICON hSmIconItem, hLgIconItem; /* icon for list-view items */ + HIMAGELIST hSmall, hLarge; /* image list for other views */ + + + /* Create the icon image lists */ + hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_MASK | ILC_COLOR32, + 1, + 1); + + hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), + ILC_MASK | ILC_COLOR32, + 1, + 1); + + /* Add an icon to each image list */ + hSmIconItem = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + + ImageList_AddIcon(hSmall, + hSmIconItem); + + hLgIconItem = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 32, + 32, + 0); + + ImageList_AddIcon(hLarge, + hLgIconItem); + + /* assign the image to the list view */ + (void)ListView_SetImageList(Info->hListView, + hSmall, + LVSIL_SMALL); + (void)ListView_SetImageList(Info->hListView, + hLarge, + LVSIL_NORMAL); + +} + + static BOOL CreateListView(PMAIN_WND_INFO Info) { @@ -396,6 +448,8 @@ (void)ListView_InsertColumn(Info->hListView, 4, &lvc); + + InitListViewImage(Info); /* check the details view menu item */ CheckMenuRadioItem(GetMenu(Info->hMainWnd), Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Thu Aug 23 18:57:44 2007 @@ -59,7 +59,7 @@ struct _PROP_DLG_INFO *PropSheet; /* status flags */ - BOOL InMenuLoop : 1; + BOOL InMenuLoop; } MAIN_WND_INFO, *PMAIN_WND_INFO; @@ -97,8 +97,8 @@ /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); BOOL SetDescription(LPTSTR, LPTSTR); -BOOL GetDescription(LPTSTR, LPTSTR *); -BOOL GetExecutablePath(PMAIN_WND_INFO Info, LPTSTR *); +LPTSTR GetDescription(LPTSTR); +LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); BOOL RefreshServiceList(PMAIN_WND_INFO Info); DWORD GetServiceList(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Thu Aug 23 18:57:44 2007 @@ -125,20 +125,24 @@ (LPARAM)Info->PropSheet->lpDisplayName); /* set the description */ - if (GetDescription(Info->CurrentService->lpServiceName, &Info->PropSheet->lpDescription)) + if (Info->PropSheet->lpDescription = GetDescription(Info->CurrentService->lpServiceName)) + { SendDlgItemMessage(Info->PropSheet->hwndGenDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, (LPARAM)Info->PropSheet->lpDescription); + } /* set the executable path */ - if (GetExecutablePath(Info, &Info->PropSheet->lpPathToExe)) + if (Info->PropSheet->lpPathToExe = GetExecutablePath(Info)) + { SendDlgItemMessage(Info->PropSheet->hwndGenDlg, IDC_EXEPATH, WM_SETTEXT, 0, (LPARAM)Info->PropSheet->lpPathToExe); + } /* set startup type */ SetStartupType(Info); @@ -182,8 +186,8 @@ static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, - WPARAM wParam, - LPARAM lParam) + WPARAM wParam, + LPARAM lParam) { PMAIN_WND_INFO Info; @@ -247,6 +251,16 @@ break; case WM_DESTROY: + if (Info->PropSheet->lpDescription) + HeapFree(ProcessHeap, + 0, + Info->PropSheet->lpDescription); + + if (Info->PropSheet->lpPathToExe) + HeapFree(ProcessHeap, + 0, + Info->PropSheet->lpPathToExe); + break; case WM_NOTIFY: Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Thu Aug 23 18:57:44 2007 @@ -27,115 +27,16 @@ } -/* Sets the service description in the registry */ -BOOL SetDescription(LPTSTR ServiceName, LPTSTR Description) -{ - HKEY hKey; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; - TCHAR szBuf[MAX_PATH]; - LONG val; - - - /* open the registry key for the service */ - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_WRITE, - &hKey); - - - if ((val = RegSetValueEx(hKey, - _T("Description"), - 0, - REG_SZ, - (LPBYTE)Description, - (DWORD)lstrlen(szBuf)+1)) != ERROR_SUCCESS) - { - //GetError(val); - return FALSE; - } - - - RegCloseKey(hKey); - return TRUE; -} - - - -/* Retrives the service description from the registry */ -BOOL GetDescription(LPTSTR lpServiceName, LPTSTR *retDescription) -{ - HKEY hKey; - LPTSTR Description = NULL; - DWORD dwValueSize = 0; - LONG ret; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; - - /* open the registry key for the service */ - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey); - - ret = RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - NULL, - &dwValueSize); - if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND && ret != ERROR_INVALID_HANDLE) - { - RegCloseKey(hKey); - return FALSE; - } - - if (ret != ERROR_FILE_NOT_FOUND) - { - Description = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - dwValueSize); - if (Description == NULL) - { - RegCloseKey(hKey); - return FALSE; - } - - if(RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)Description, - &dwValueSize)) - { - HeapFree(ProcessHeap, - 0, - Description); - RegCloseKey(hKey); - return FALSE; - } - } - - /* copy pointer over */ - *retDescription = Description; - - return TRUE; -} - /* get vendor of service binary */ -BOOL -GetExecutablePath(PMAIN_WND_INFO Info, - LPTSTR *ExePath) +LPTSTR +GetExecutablePath(PMAIN_WND_INFO Info) { SC_HANDLE hSCManager = NULL; SC_HANDLE hSc = NULL; LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; DWORD BytesNeeded = 0; + LPTSTR lpExePath = NULL; /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, @@ -157,7 +58,6 @@ goto cleanup; } - if (!QueryServiceConfig(hSc, pServiceConfig, 0, @@ -165,97 +65,38 @@ { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - pServiceConfig = (LPQUERY_SERVICE_CONFIG) - HeapAlloc(ProcessHeap, - 0, - BytesNeeded); + pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(ProcessHeap, + 0, + BytesNeeded); if (pServiceConfig == NULL) goto cleanup; - if (!QueryServiceConfig(hSc, - pServiceConfig, - BytesNeeded, - &BytesNeeded)) - { - HeapFree(ProcessHeap, - 0, - pServiceConfig); - goto cleanup; + if (QueryServiceConfig(hSc, + pServiceConfig, + BytesNeeded, + &BytesNeeded)) + { + lpExePath = HeapAlloc(ProcessHeap, + 0, + (_tcslen(pServiceConfig->lpBinaryPathName) +1 ) * sizeof(TCHAR)); + + _tcscpy(lpExePath, pServiceConfig->lpBinaryPathName); } } - else /* exit on failure */ - { - goto cleanup; - } - } - - *ExePath = pServiceConfig->lpBinaryPathName; - - CloseServiceHandle(hSCManager); - CloseServiceHandle(hSc); - - return TRUE; + } cleanup: + if (pServiceConfig) + HeapFree(ProcessHeap, + 0, + pServiceConfig); if (hSCManager != NULL) CloseServiceHandle(hSCManager); if (hSc != NULL) CloseServiceHandle(hSc); - return FALSE; + + return lpExePath; } - - -static VOID -InitListViewImage(PMAIN_WND_INFO Info) -{ - HICON hSmIconItem, hLgIconItem; /* icon for list-view items */ - HIMAGELIST hSmall, hLarge; /* image list for other views */ - - - /* Create the icon image lists */ - hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - ILC_MASK | ILC_COLOR32, - 1, - 1); - - hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), - ILC_MASK | ILC_COLOR32, - 1, - 1); - - /* Add an icon to each image list */ - hSmIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - ImageList_AddIcon(hSmall, - hSmIconItem); - - hLgIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 32, - 32, - 0); - - ImageList_AddIcon(hLarge, - hLgIconItem); - - /* assign the image to the list view */ - (void)ListView_SetImageList(Info->hListView, - hSmall, - LVSIL_SMALL); - (void)ListView_SetImageList(Info->hListView, - hLarge, - LVSIL_NORMAL); - -} - BOOL @@ -270,8 +111,6 @@ (void)ListView_DeleteAllItems(Info->hListView); - InitListViewImage(Info); - NumServices = GetServiceList(Info); if (NumServices) @@ -282,7 +121,7 @@ for (Index = 0; Index < NumServices; Index++) { HKEY hKey = NULL; - LPTSTR Description = NULL; + LPTSTR lpDescription = NULL; LPTSTR LogOnAs = NULL; DWORD StartUp = 0; DWORD dwValueSize; @@ -313,12 +152,10 @@ lvItem.iItem = ListView_GetItemCount(Info->hListView); lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); - - /* set the description */ - if (GetDescription(Info->pServiceStatus[Index].lpServiceName, &Description)) - { - lvItem.pszText = Description; + if (lpDescription = GetDescription(Info->pServiceStatus[Index].lpServiceName)) + { + lvItem.pszText = lpDescription; lvItem.iSubItem = 1; SendMessage(Info->hListView, LVM_SETITEMTEXT, @@ -327,9 +164,8 @@ HeapFree(ProcessHeap, 0, - Description); - } - + lpDescription); + } /* set the status */ if (Info->pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) @@ -346,8 +182,6 @@ (LPARAM)&lvItem); } - - /* set the startup type */ dwValueSize = sizeof(DWORD); if (RegQueryValueEx(hKey, @@ -400,8 +234,6 @@ lvItem.iItem, (LPARAM)&lvItem); } - - /* set Log On As */ dwValueSize = 0; @@ -515,7 +347,7 @@ 0, BytesNeeded); if (Info->pServiceStatus == NULL) - return FALSE; + return FALSE; /* fill array with service info */ if (EnumServicesStatusEx(ScHandle, Added: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (added) +++ trunk/reactos/base/applications/mscutils/servman/reg.c Thu Aug 23 18:57:44 2007 @@ -1,0 +1,106 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/servman/reg.c + * PURPOSE: Query service information + * COPYRIGHT: Copyright 2005 - 2007 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include "precomp.h" + +/* Sets the service description in the registry */ +BOOL SetDescription(LPTSTR ServiceName, LPTSTR Description) +{ + HKEY hKey; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + TCHAR buf[300]; + TCHAR szBuf[MAX_PATH]; + LONG val; + + + /* open the registry key for the service */ + _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName); + RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_WRITE, + &hKey); + + + if ((val = RegSetValueEx(hKey, + _T("Description"), + 0, + REG_SZ, + (LPBYTE)Description, + (DWORD)lstrlen(szBuf)+1)) != ERROR_SUCCESS) + { + //GetError(val); + return FALSE; + } + + + RegCloseKey(hKey); + return TRUE; +} + + + +/* Retrives the service description from the registry */ +LPTSTR +GetDescription(LPTSTR lpServiceName) +{ + HKEY hKey; + LPTSTR lpDescription = NULL; + DWORD dwValueSize = 0; + LONG ret; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + TCHAR buf[300]; + + /* open the registry key for the service */ + _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName); + RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey); + + ret = RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + NULL, + &dwValueSize); + if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND && ret != ERROR_INVALID_HANDLE) + { + RegCloseKey(hKey); + return FALSE; + } + + if (ret != ERROR_FILE_NOT_FOUND) + { + lpDescription = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + dwValueSize); + if (lpDescription == NULL) + { + RegCloseKey(hKey); + return FALSE; + } + + if(RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + (LPBYTE)lpDescription, + &dwValueSize)) + { + HeapFree(ProcessHeap, + 0, + lpDescription); + RegCloseKey(hKey); + } + } + + return lpDescription; +}

1 0

[fireball] 28471: - Commiting freeldr OFW stub source code. In order to compile them, you need to have a cygwin install (or be under *nix system which is able to produce a real elf result). Source code is not cleaned up, but I decided to commit right away so they don't get lost.
by fireball＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: fireball Date: Thu Aug 23 18:16:28 2007 New Revision: 28471 URL: http://svn.reactos.org/svn/reactos?rev=28471&view=rev Log: - Commiting freeldr OFW stub source code. In order to compile them, you need to have a cygwin install (or be under *nix system which is able to produce a real elf result). Source code is not cleaned up, but I decided to commit right away so they don't get lost. Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/1275.h (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/callofw.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/debug.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/intprop.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/lib.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/main.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.h (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/mem.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/printf.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/property.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/regprop.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/stdio.h (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strings.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strprop.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/types.h (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers64.c (with props) branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/x86/ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/x86/makefile (with props) Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/1275.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/1275.h (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/1275.h Thu Aug 23 18:16:28 2007 @@ -1,0 +1,49 @@ +// See license at end of file + +#include "types.h" + +typedef long phandle; +typedef long ihandle; + +typedef struct { + long hi, lo; + long size; +} reg; + +#ifdef putchar +# undef putchar +#endif +#ifdef puts +# undef puts +#endif + +typedef enum { + NOALLOC, + ALLOC +} allocflag; + +#define new(t) (t *)zalloc(sizeof(t)); + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/1275.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/callofw.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/callofw.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/callofw.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,93 @@ +/* + * callofw.c - Open Firmware client interface for 32-bit systems. + * This code is intended to be portable to any 32-bit Open Firmware + * implementation with a standard client interface that can be + * called when Linux is running. + */ + +#include <stdarg.h> +#include <asm/callofw.h> +#include <linux/types.h> +#include <linux/spinlock.h> + +u32 (*call_firmware)(u32 *); + +static DEFINE_SPINLOCK(prom_lock); + +#define MAXARGS 20 +int callofw(char *name, int numargs, int numres, ...) +{ + va_list ap; + u32 argarray[MAXARGS+3]; + int argnum = 3; + int retval; + int *intp; + unsigned long flags; + + if (call_firmware == NULL) + return -1; + + argarray[0] = (u32)name; + argarray[1] = numargs; + argarray[2] = numres; + + if ((numargs + numres) > MAXARGS) + return -1; + + va_start(ap, numres); + while (numargs--) + argarray[argnum++] = va_arg(ap, int); + + spin_lock_irqsave(&prom_lock, flags); + retval = call_firmware(argarray); + spin_unlock_irqrestore(&prom_lock, flags); + + if (retval == 0) { + while (numres--) { + intp = va_arg(ap, int *); + *intp = argarray[argnum++]; + } + } + va_end(ap); + return retval; +} + +/* +The return value from callofw in all cases is 0 if the attempt to call the +function succeeded, nonzero otherwise. That return value is from the +gateway function only. Any results from the called function are returned +via output argument pointers. + +Here are call templates for all the standard OFW client services. + +callofw("test", 1, 1, namestr, &missing); +callofw("peer", 1, 1, phandle, &sibling_phandle); +callofw("child", 1, 1, phandle, &child_phandle); +callofw("parent", 1, 1, phandle, &parent_phandle); +callofw("instance-to-package", 1, 1, ihandle, &phandle); +callofw("getproplen", 2, 1, phandle, namestr, &proplen); +callofw("getprop", 4, 1, phandle, namestr, bufaddr, buflen, &size); +callofw("nextprop", 3, 1, phandle, previousstr, bufaddr, &flag); +callofw("setprop", 4, 1, phandle, namestr, bufaddr, len, &size); +callofw("canon", 3, 1, devspecstr, bufaddr, buflen, &length); +callofw("finddevice", 1, 1, devspecstr, &phandle); +callofw("instance-to-path", 3, 1, ihandle, bufaddr, buflen, &length); +callofw("instance-to-interposed-path", 3, 1, ihandle, bufaddr, buflen, &length); +callofw("package-to-path", 3, 1, phandle, bufaddr, buflen, &length); +callofw("call-method", numin, numout, in0, in1, ..., &out0, &out1, ...); +callofw("open", 1, 1, devspecstr, &ihandle); +callofw("close", 1, 0, ihandle); +callofw("read", 3, 1, ihandle, addr, len, &actual); +callofw("write", 3, 1, ihandle, addr, len, &actual); +callofw("seek", 3, 1, ihandle, pos_hi, pos_lo, &status); +callofw("claim", 3, 1, virtaddr, size, align, &baseaddr); +callofw("release", 2, 0, virtaddr, size); +callofw("boot", 1, 0, bootspecstr); +callofw("enter", 0, 0); +callofw("exit", 0, 0); +callofw("chain", 5, 0, virtaddr, size, entryaddr, argsaddr, len); +callofw("interpret", numin+1, numout+1, cmdstr, in0, ..., &catchres, &out0, ...); +callofw("set-callback", 1, 1, newfuncaddr, &oldfuncaddr); +callofw("set-symbol-lookup", 2, 0, symtovaladdr, valtosymaddr); +callofw("milliseconds", 0, 1, &ms); +*/ Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/callofw.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/debug.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/debug.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/debug.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,51 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +#include <stdarg.h> + +int level = 0; + +int Debug = 0; + +VOID +debug(int debug_level, char *fmt, ...) +{ + va_list args; + int i; + + if (!(debug_level & Debug)) + return; + + va_start(args, fmt); + for (i = 0; i < level; ++i) + putchar('\t'); + printf(fmt, args); + va_end(args); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/debug.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/intprop.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/intprop.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/intprop.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,68 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +int +decode_int(UCHAR *p) +{ + ULONG i = *p++ << 8; + i = (i + *p++) << 8; + i = (i + *p++) << 8; + return (i + *p); +} + +int +get_int_prop(phandle node, char *key) +{ + int res; + char buf[sizeof(int)]; + + res = OFGetprop(node, key, buf, sizeof(int)); + if (res != sizeof(int)) { +#ifdef notdef + fatal("get_int_prop(node %x, key '%s') returned %x\n", + node, key, res); +#endif + return(-1); + } + return(decode_int((UCHAR *) buf)); +} + +int +get_int_prop_def(phandle node, char *key, int defval) +{ + int res; + char buf[sizeof(int)]; + + res = OFGetprop(node, key, buf, sizeof(int)); + if (res != sizeof(int)) { + return(defval); + } + return(decode_int((UCHAR *) buf)); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/intprop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/lib.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/lib.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/lib.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,302 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +extern void *malloc(); +extern char *get_str_prop(); +extern int get_int_prop(); +extern int get_int_prop_def(); + +void +abort() +{ + OFExit(); +} + +void +exit() +{ + OFExit(); +} + +VOID +sleep(ULONG delay) +{ + delay = (delay * 1000) + OFMilliseconds(); + while ((OFMilliseconds() - delay) < 0) + ; +} + +/* files */ + +#include "stdio.h" + +FILE _stdin = { -1, 0, 0}; +FILE _stdout = { -1, 0, 0}; +FILE *stdin = &_stdin; +FILE *stdout = &_stdout; + +char _homedir[128]; + +char * +gethomedir() +{ + return(_homedir); +} + +parse_homedir(char *progname) +{ + char *p, *q, c; + + p = progname + strlen(progname); + while (p > progname) { + c = *--p; + if (c == ',' || c == ':' || c == '\\') { + ++p; + break; + } + } + for (q = _homedir; progname < p; ) + *q++ = *progname++; + + *q = '\0'; +} + +int +ofw_setup() +{ + static char *argv[8]; + phandle ph; + char *argstr; + int i; + + if ((ph = OFFinddevice("/chosen")) == -1) + abort() ; + stdin->id = get_int_prop(ph, "stdin"); + stdout->id = get_int_prop(ph, "stdout"); + + argv[0] = get_str_prop(ph, "bootpath", ALLOC); + argstr = get_str_prop(ph, "bootargs", ALLOC); + + for (i = 1; i < 8;) { + if (*argstr == '\0') + break; + argv[i++] = argstr; + while (*argstr != ' ' && *argstr != '\0') + ++argstr; + if (*argstr == '\0') + break; + *argstr++ = '\0'; + } + parse_homedir(argv[0]); + main(i, argv); +} + +FILE * +fopen (char *name, char *mode) +{ + FILE *fp; + + fp = (FILE *)malloc(sizeof(struct _file)); + if (fp == (FILE *)NULL) + return ((FILE *)NULL); + + if ((fp->id = OFOpen(name)) == 0) + return ((FILE *)NULL); + + fp->bufc = 0; + return(fp); +} + +int +ferror(FILE *fp) +{ + return(0); /* Implement me */ +} + +void +fputc(char c, FILE *fp) +{ + if (fp == stdout && c == '\n') + fputc('\r', fp); + + fp->buf[fp->bufc++] = c; + + if ((fp->bufc == 127) || (fp == stdout && c == '\n')) { + OFWrite(fp->id, fp->buf, fp->bufc); + fp->bufc = 0; + } +} + +void +fflush (FILE *fp) +{ + if (fp->bufc != 0) { + OFWrite(fp->id, fp->buf, fp->bufc); + fp->bufc = 0; + } +} + +int +fgetc(FILE *fp) +{ + int count; + + /* try to read from the buffer */ + if (fp->bufc != 0) { + fp->bufc--; + return(*fp->inbufp++); + } + + /* read from the file */ + do { + count = OFRead(fp->id, fp->buf, 128); + } while (count == -2); /* Wait until input available */ + + if (count > 0) + { + fp->bufc = count-1; + fp->inbufp = fp->buf; + return(*fp->inbufp++); + } + + /* otherwise return EOF */ + return (-1); +} + +int +fclose (FILE *fp) +{ + fflush(fp); + OFClose(fp->id); + free(fp); + return(0); +} + +int +getchar() +{ + return(fgetc(stdin)); +} + +VOID +putchar(char c) +{ + fputc(c, stdout); +} + +int +puts(char *s) +{ + fputs(s, stdout); + putchar('\n'); + return(0); +} + +VOID +gets(char *buf) +{ + while ((*buf = getchar()) != '\r') + buf++; + *buf = '\0'; +} + +int +fputs(char *s, FILE *f) +{ + register char c; + while(c = *s++) + fputc(c, f); + return(0); +} + +char * +fgets(char *buf, int n, FILE *f) +{ + char *p = buf; + + while ((n > 1) && ((*p = fgetc(f)) != '\n')) { + p++; + n--; + } + *p = '\0'; + return(buf); +} + +unlink(char *filename) +{ + return(-1); +/* XXX Implement me */ +} + +system(char *str) +{ + OFInterpret0(str); +} + +#define MAXENV 256 +char * +getenv(char *str) +{ + phandle ph; + int res; + + if ((ph = OFFinddevice("/options")) == -1) + return(NULL); + + return (get_str_prop(ph, str, 0)); +} + +int +stdout_rows() +{ + phandle ph; + int res; + + if ((ph = OFFinddevice("/chosen")) == -1) + return(24); + res = get_int_prop_def(ph, "stdout-#lines", 24); + if (res < 0) + return(24); /* XXX should look in device node too */ + return (res); +} + +int +stdout_columns() +{ + phandle ph; + int res; + + if ((ph = OFFinddevice("/chosen")) == -1) + return(80); + res = get_int_prop_def(ph, "stdout-#columns", 80); + if (res < 0) + return(80); /* XXX should look in device node too */ + return (res); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/lib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/main.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/main.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/main.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,6 @@ +#ifdef __GNUC__ +void +__main() +{ +} +#endif Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,307 @@ +// See license at end of file + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * A "smarter" malloc William L. Sebok + * Sept. 24, 1984 + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * If n = the size of an area rounded DOWN to the nearest power of two, + * all free areas of memory whose length is the same index n is organized + * into a chain with other free areas of index n. A request for memory + * takes the first item in the chain whose index is the size of the + * request rounded UP to the nearest power of two. If this chain is + * empty the next higher chain is examined. If no larger chain has memory + * then new memory is allocated. Only the amount of new memory needed is + * allocated. Any old free memory left after an allocation is returned + * to the free list. Extra new memory returned because of rounding + * to page boundaries is returned to free list. + * + * All memory areas (free or busy) handled by malloc are also chained + * sequentially by increasing address. When memory is freed it is + * merged with adjacent free areas, if any. If a free area of memory + * ends at the end of memory (i.e. at the break), the break is + * contracted, freeing the memory back to the system. + * + * Notes: + * ov_length field includes sizeof(struct overhead) + * adjacency chain includes all memory, allocated plus free. + */ + +#define MALLOC +#include "malloc.h" +#ifndef NULL +#define NULL 0 +#endif +#ifdef debug +# define ASSERT(p,q) if (!(p)) fatal(q) +#else +# define ASSERT(p,q) +#endif + +#define ALIGN(n, granule) ((n + ((granule)-1)) & ~((granule)-1)) +/* +// PowerPC page size = 4 KB; PC page size is the same??? +*/ + +#define PAGE_SIZE (ULONG)0x1000 +#define ULONG unsigned long + +char * +malloc(nbytes) + unsigned nbytes; +{ + extern ULONG OFClaim(); + register struct overhead *p, *q; + register int surplus; + register struct qelem *bucket; + nbytes = ALIGN(nbytes, NALIGN) + sizeof(struct overhead); + bucket = &buckets[_log2(nbytes-1) + 1]; /* log2 rounded up */ + for (p = NULL; bucket < &buckets[NBUCKETS]; bucket++) { + if (bucket->q_forw != bucket) { + /* remove from bucket chain */ + p = FROMBUK(bucket->q_forw); + ASSERT(p->ov_magic == MAGIC_FREE, "\nmalloc: Entry \ +not marked FREE found on Free List!\n"); + remque(TOBUK(p)); + surplus = p->ov_length - nbytes; + break; + } + } + if (p == NULL) { +#ifdef USE_SBRK + register int i; + p = (struct overhead *)CURBRK; + if ((int)p == -1) + return(NULL); + if (i = (int)p&(NALIGN-1)) + sbrk(NALIGN-i); + p = (struct overhead *)sbrk(nbytes); + if ((int)p == -1) + return(NULL); + q = (struct overhead *)CURBRK; + if ((int)q == -1) + return(NULL); + p->ov_length = (char *)q - (char *)p; + surplus = p->ov_length - nbytes; + /* add to end of adjacency chain */ + ASSERT((FROMADJ(adjhead.q_back)) < p, "\nmalloc: Entry in \ +adjacency chain found with address lower than Chain head!\n" ); + insque(TOADJ(p),adjhead.q_back); +#else + struct qelem *pp; + int alloc_size = ALIGN(nbytes, PAGE_SIZE); + + p = (struct overhead *)OFClaim(0, alloc_size, NALIGN); + if (p == (struct overhead *)-1) + return(NULL); + p->ov_length = alloc_size; + surplus = p->ov_length - nbytes; + + /* add to adjacency chain in the correct place */ + for (pp = adjhead.q_forw; + pp != &adjhead; + pp = pp->q_forw) { + if (p < FROMADJ(pp)) + break; + } + ASSERT(pp == &adjhead || (p < FROMADJ(pp)), + "\nmalloc: Bogus insertion in adjacency list\n"); + insque(TOADJ(p),pp->q_back); +#endif + } + if (surplus > sizeof(struct overhead)) { + /* if big enough, split it up */ + q = (struct overhead *)( (char *)p + nbytes); + q->ov_length = surplus; + p->ov_length = nbytes; + q->ov_magic = MAGIC_FREE; + /* add surplus into adjacency chain */ + insque(TOADJ(q),TOADJ(p)); + /* add surplus into bucket chain */ + insque(TOBUK(q),&buckets[_log2(surplus)]); + } + p->ov_magic = MAGIC_BUSY; + return((char*)p + sizeof(struct overhead)); +} + +void +free(mem) +register char *mem; +{ + register struct overhead *p, *q; + if (mem == NULL) + return; + p = (struct overhead *)(mem - sizeof(struct overhead)); + if (p->ov_magic == MAGIC_FREE) + return; + if (p->ov_magic != MAGIC_BUSY) { + fatal("attempt to free memory not allocated with malloc!\n"); + } + q = FROMADJ((TOADJ(p))->q_back); + if (q != FROMADJ(&adjhead)) { /* q is not the first list item */ + ASSERT(q < p, "\nfree: While trying to merge a free area with \ +a lower adjacent free area,\n addresses were found out of order!\n"); + /* If lower segment can be merged */ + if ( q->ov_magic == MAGIC_FREE + && (char *)q + q->ov_length == (char *)p + ) { + /* remove lower address area from bucket chain */ + remque(TOBUK(q)); + /* remove upper address area from adjacency chain */ + remque(TOADJ(p)); + q->ov_length += p->ov_length; + p->ov_magic = NULL; + p = q; + } + } + q = FROMADJ((TOADJ(p))->q_forw); + if (q != FROMADJ(&adjhead)) { /* q is not the last list item */ + /* upper segment can be merged */ + ASSERT(q > p, "\nfree: While trying to merge a free area with \ +a higher adjacent free area,\n addresses were found out of order!\n"); + if ( q->ov_magic == MAGIC_FREE + && (char *)p + p->ov_length == (char *)q + ) { + /* remove upper from bucket chain */ + remque(TOBUK(q)); + /* remove upper from adjacency chain */ + remque(TOADJ(q)); + p->ov_length += q->ov_length; + q->ov_magic = NULL; + } + } +#ifdef USE_SBRK + if ( /* freed area is at end of memory */ + endfree && adjhead.q_back == TOADJ(p) + && (char*)p + p->ov_length == (char *)CURBRK + ) { + /* remove from end of adjacency chain */ + remque(adjhead.q_back); + /* release memory to system */ + sbrk( -((int)(p->ov_length))); + return; + } +#endif + p->ov_magic = MAGIC_FREE; + /* place in bucket chain */ + insque(TOBUK(p),&buckets[_log2(p->ov_length)]); + return; +} + +char * +realloc(mem,nbytes) +register char *mem; unsigned nbytes; +{ + register char *newmem; + register struct overhead *p, *q; + register int surplus; + if (mem == NULL) + return(malloc(nbytes)); + if(mem > (char*)FROMADJ(adjhead.q_back) + sizeof(struct overhead)) + return(NULL); + + p = (struct overhead *)(mem - sizeof(struct overhead)); + nbytes = (nbytes + (NALIGN-1)) & (~(NALIGN-1)); + if ( p->ov_magic == MAGIC_BUSY + && (q = FROMADJ(adjhead.q_back)) != p + && (q->ov_magic != MAGIC_FREE || (FROMADJ(q->ov_adj.q_back) != p)) + ) + free(mem); + if( (p->ov_magic == MAGIC_BUSY || p->ov_magic == MAGIC_FREE) + && (surplus = p->ov_length - nbytes - sizeof(struct overhead)) >= 0 + ) { + if (surplus > sizeof(struct overhead)) { + /* return surplus to free list */ + nbytes += sizeof(struct overhead); +#ifdef USE_SBRK + if ( /* freed area is at end of memory */ + endfree && adjhead.q_back == TOADJ(p) + && (char*)p + p->ov_length == (char *)CURBRK + ) { + /* release memory to system */ + sbrk(-surplus); + } else +#endif + { + q = (struct overhead *)( (char *)p + nbytes); + q->ov_length = surplus; + q->ov_magic = MAGIC_FREE; + insque(TOADJ(q),TOADJ(p)); + insque(TOBUK(q),&buckets[_log2(surplus)]); + } + p->ov_length = nbytes; + } + if (p->ov_magic == MAGIC_FREE) { + remque(TOBUK(p)); + p->ov_magic = MAGIC_BUSY; + } + return(mem); + } + newmem = malloc(nbytes); + if (newmem != mem && newmem != NULL) { + register int n; + if (p->ov_magic == MAGIC_BUSY || p->ov_magic == MAGIC_FREE) { + n = p->ov_length - sizeof(struct overhead); + nbytes = (nbytes < n) ? nbytes : n ; + } + memcpy(newmem,mem,nbytes); + } + if (p->ov_magic == MAGIC_BUSY) + free(mem); + return(newmem); +} + +_log2(n) +register int n; +{ + register int i = 0; + while ((n >>= 1) > 0) + i++; + return(i); +} + +void +insque(item,queu) +register struct qelem *item, *queu; +{ + register struct qelem *pueu; + pueu = queu->q_forw; + item->q_forw = pueu; + item->q_back = queu; + queu->q_forw = item; + pueu->q_back = item; +} + +void +remque(item) +register struct qelem *item; +{ + register struct qelem *queu, *pueu; + pueu = item->q_forw; + queu = item->q_back; + queu->q_forw = pueu; + pueu->q_back = queu; +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.h (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.h Thu Aug 23 18:16:28 2007 @@ -1,0 +1,96 @@ +// See license at end of file + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * A "smarter" malloc William L. Sebok + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +#define MAGIC_FREE 0x548a934c +#define MAGIC_BUSY 0xc139569a + +#define NBUCKETS 24 +#define NALIGN sizeof(long) + +struct qelem { + struct qelem *q_forw; + struct qelem *q_back; +}; + +struct overhead { + struct qelem ov_adj; /* adjacency chain pointers */ + struct qelem ov_buk; /* bucket chain pointers */ + long ov_magic; + unsigned long ov_length; +}; + +#ifdef MALLOC +char endfree = 0; +struct qelem adjhead = { &adjhead, &adjhead }; +struct qelem buckets[NBUCKETS] = { + &buckets[0], &buckets[0], + &buckets[1], &buckets[1], + &buckets[2], &buckets[2], + &buckets[3], &buckets[3], + &buckets[4], &buckets[4], + &buckets[5], &buckets[5], + &buckets[6], &buckets[6], + &buckets[7], &buckets[7], + &buckets[8], &buckets[8], + &buckets[9], &buckets[9], + &buckets[10], &buckets[10], + &buckets[11], &buckets[11], + &buckets[12], &buckets[12], + &buckets[13], &buckets[13], + &buckets[14], &buckets[14], + &buckets[15], &buckets[15], + &buckets[16], &buckets[16], + &buckets[17], &buckets[17], + &buckets[18], &buckets[18], + &buckets[19], &buckets[19], + &buckets[20], &buckets[20], + &buckets[21], &buckets[21], + &buckets[22], &buckets[22], + &buckets[23], &buckets[23], +}; +#else +extern char endfree; +extern struct qelem adjhead, buckets[NBUCKETS]; +#endif + +/* + * The following macros depend on the order of the elements in struct overhead + */ +#define TOADJ(p) ((struct qelem *)(p)) +#define FROMADJ(p) ((struct overhead *)(p)) +#define FROMBUK(p) ((struct overhead *)( (char *)p - sizeof(struct qelem))) +#define TOBUK(p) ((struct qelem *)( (char *)p + sizeof(struct qelem))) + +#ifndef CURBRK +#define CURBRK sbrk(0) +#endif CURBRK + +extern void insque(), remque(); +extern char *malloc(), *realloc(); + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/malloc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/mem.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/mem.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/mem.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,17 @@ +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +VOID +memcpy(char *to, char *from, size_t len) +{ + while (len--) + *to++ = *from++; +} + +VOID +memset(char *cp, int c, size_t len) +{ + while (len--) + *(cp + len) = c; +} Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/mem.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/printf.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/printf.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/printf.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,177 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +#include <stdarg.h> + +int +atoi(char *s) +{ + int temp = 0, base = 10; + + if (*s == '0') { + ++s; + if (*s == 'x') { + ++s; + base = 16; + } else { + base = 8; + } + } + while (*s) { + switch (*s) { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + temp = (temp * base) + (*s++ - '0'); + break; + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + temp = (temp * base) + (*s++ - 'a' + 10); + break; + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + temp = (temp * base) + (*s++ - 'A' + 10); + break; + default: + return (temp); + } + } + return (temp); +} + +STATIC int +printbase(ULONG x, int base) +{ + static char itoa[] = "0123456789abcdef"; + ULONG j; + char buf[16], *s = buf; + int n = 0; + + if (x == 0) { + putchar('0'); + n++; + return (n); + } + memset(buf, 16, 0); + while (x) { + j = x % base; + *s++ = itoa[j]; + x -= j; + x /= base; + } + + for (--s; s >= buf; --s) { + putchar(*s); + n++; + } + return (n); +} + +int +_printf(char *fmt, va_list args) +{ + ULONG x; + char c, *s; + int n = 0; + + while (c = *fmt++) { + if (c != '%') { + putchar(c); + n++; + continue; + } + switch (c = *fmt++) { + case 'x': + x = va_arg(args, ULONG); + n += printbase(x, 16); + break; + case 'o': + x = va_arg(args, ULONG); + n += printbase(x, 8); + break; + case 'd': + x = va_arg(args, ULONG); + if ((LONG) x < 0) { + putchar('-'); + n++; + x = -x; + } + n += printbase(x, 10); + break; + case 'c': + c = va_arg(args, char); + putchar(c); + n++; + break; + case 's': + s = va_arg(args, char *); + while (*s) { + putchar(*s++); + n++; + } + break; + default: + putchar(c); + n++; + break; + } + } + return(n); +} + +int +printf(char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i = _printf(fmt, args); + va_end(args); + return (i); +} + +VOID +warn(char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + (void)_printf(fmt, args); + va_end(args); +} + +VOID +fatal(char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + (void)_printf(fmt, args); + OFExit(); + va_end(args); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/printf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/property.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/property.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/property.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,66 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +STATIC int +decode_int(UCHAR *p) +{ + ULONG i = *p++ << 8; + i = (i + *p++) << 8; + i = (i + *p++) << 8; + return (i + *p); +} + +int +get_int_prop(phandle node, char *key) +{ + int res; + char buf[sizeof(int)]; + + res = OFGetprop(node, key, buf, sizeof(int)); + if (res != sizeof(int)) { + fatal("get_int_prop(node %x, key '%s') returned %x\n", + node, key, res); + return(-1); + } + return(decode_int((UCHAR *) buf)); +} + +int +get_int_prop_def(phandle node, char *key, int defval) +{ + int res; + char buf[sizeof(int)]; + + res = OFGetprop(node, key, buf, sizeof(int)); + if (res != sizeof(int)) { + return(defval); + } + return(decode_int((UCHAR *) buf)); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/property.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/regprop.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/regprop.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/regprop.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,65 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +reg * +decode_reg(UCHAR *buf, int buflen) +{ + static reg staticreg; + reg *sregp; + int i; + + if (buflen) + staticreg.hi = decode_int(buf); + if (buflen > 4) + staticreg.lo = decode_int(buf+4); + if (buflen > 8) + staticreg.size = decode_int(buf+8); + return (sregp = &staticreg); +} + +reg * +get_reg_prop(phandle node, char *key) +{ + int res; + char *buf; + reg *regp; + int len = OFGetproplen(node, key); + + buf = (char *)malloc(len); + res = OFGetprop(node, key, buf, len); + if (res != len) { + fatal("get_reg_prop(node %x, key '%s', len %x) returned %x\n", + node, key, len, res); + return ((reg *) 0); + } + regp = decode_reg(buf, len); + free(buf); + return (regp); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/regprop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/stdio.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/stdio.h (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/stdio.h Thu Aug 23 18:16:28 2007 @@ -1,0 +1,39 @@ +// See license at end of file + +typedef struct _file { + long id; + int bufc; + char *inbufp; + char buf[128]; +} FILE; + +extern FILE *stdin; +extern FILE *stdout; + +#define EOF -1 +extern FILE *fopen(); + + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/stdio.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strings.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strings.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strings.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,128 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +int +strcmp(const char *s, const char *t) +{ + int i; + + for (i = 0; s[i] == t[i]; ++i) + if (s[i] == '\0') + return (0); + return((int) (s[i] - t[i])); +} + +int +strncmp(const char *s, const char *t, size_t len) +{ + int i; + + for (i = 0; (s[i] == t[i]) && (i != len); ++i) + if (s[i] == '\0') + return (0); + if (i == len) + return(0); + return((int) (s[i] - t[i])); +} + +size_t +strlen(const char *s) +{ + int i; + + for (i = 0; s[i] != '\0'; ++i) + ; + return((size_t) i); +} + +char * +strcpy(char *to, const char *from) +{ + int i = 0; + + while (to[i] = from[i]) + i += 1; + return(to); +} + +char * +strncpy(char *to, const char *from, int maxlen) +{ + int i = 0; + + while ((maxlen != 0) && (to[i] = from[i])) + { + i += 1; + maxlen--; + } + return(to); +} + +char * +strcat(char *to, const char *from) +{ + char *ret = to; + + while (*to) + to += 1; + strcpy(to, from); + return (ret); +} +char * +index(char *s, int c) +{ + while (*s) { + if (*s == c) + return (s); + ++s; + } + return ((char *) 0); +} + +char * +strctok(char *s, const char sep) +{ + static char *saved_str = NULL; + char *temp; + + if (s != NULL) + saved_str = s; + if (saved_str == NULL) + return(NULL); + s = index(saved_str, sep); + if (s != NULL) { + *s++ = '\0'; + while (*s && (*s == sep)) + ++s; + } + temp = saved_str; + saved_str = s; + return(temp); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strings.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strprop.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strprop.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strprop.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,80 @@ +// See license at end of file + +/* For gcc, compile with -fno-builtin to suppress warnings */ + +#include "1275.h" + +extern void *malloc(); +VOID * +zalloc(int size) +{ + VOID *vp; + + vp = (void *)malloc(size); + memset(vp, size, 0); + return (vp); +} + +char * +get_str_prop(phandle node, char *key, allocflag alloc) +{ + int len, res; + static char *priv_buf, priv_buf_len = 0; + char *cp; + + len = OFGetproplen(node, key); + if (len == -1 || len == 0) + return((char *) 0); + + /* + * Leave room for a null terminator, on the off chance that the + * property isn't null-terminated. + */ + len += 1; + if (alloc == ALLOC) + cp = (char *) zalloc(len); + else { + if (len > priv_buf_len) { + if (priv_buf_len) + free(priv_buf); + priv_buf = (char *) zalloc(len); + priv_buf_len = len; + } else + memset(priv_buf, len, 0); + cp = priv_buf; + } + len -= 1; + + res = OFGetprop(node, key, cp, len); + if (res != len) { + fatal( + "get_str_prop(node %x, key '%s', len %x) returned len %x\n", + node, key, len, res); + return((char *) 0); + } + return(cp); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/strprop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/types.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/types.h (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/types.h Thu Aug 23 18:16:28 2007 @@ -1,0 +1,10 @@ +#define STATIC static +#define VOID void +#define UCHAR unsigned char +#define ULONG unsigned long +#define LONG long +#define NULL 0 + +typedef unsigned int size_t; + +VOID fatal(char *fmt, ...); Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/types.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,545 @@ +// See license at end of file + +/*++ + +Abstract: + + This module implements the wrapper for the P1275 boot firmware client + program interface. There is a wrapper routine for each of the client + interface service. The wrapper routine constructs a client interface + argument array as illustraed in the figure below, places its address + in r3 and transfers control to the client interface handler. The + return address of the wrapper routine is placed in lr register. + + The Client interface handler performs the service specified in the + argument array and return to wrapper routine which in turn return + to the client program. The client interface handler returns an + overall success or failure code to the caller as a subroutine + return value (%o0 for SPARC, %r3 for PowerPC, %eax for x86). + + + Layout of the argument array + + +--------------------------------------+ + | Name of the client interface service | + +--------------------------------------+ + | Number of input arguments | + +--------------------------------------+ + | Number of return values | + +--------------------------------------+ + | Input arguments (arg1, ..., argN) | + +--------------------------------------+ + | Returned values (ret1, ..., retN) | + +--------------------------------------+ + +--*/ + +#include "1275.h" + +#ifdef SPRO +typedef long long cell_t; +#else +typedef unsigned long cell_t ; +#endif + +#ifdef CIF64 +#define LOW(index) ((index*2) + 1) +#else +#define LOW(index) (index) +#endif + +extern int call_firmware(ULONG *); +extern void warn(char *fmt, ...); + +#ifdef CIF64 +#define CIF_HANDLER_IN 6 +#else +#define CIF_HANDLER_IN 3 +#endif + +// Device tree routines + +// +// Peer() - This routines outputs the identifier(phandle) of the device node that is +// the next sibling of the specified device node. +// +// Inputs: +// phandle - identifier of a device node +// +// Outputs: +// sibling_phandle - identifier of the next sibling. +// Zero if there are no more siblings. +// + +phandle +OFPeer(phandle device_id) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"peer", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"peer",1,1,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = device_id; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle)argarray[CIF_HANDLER_IN+LOW(1)]); +} + +phandle +OFChild(phandle device_id) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"child", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"child",1,1,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = device_id; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle)argarray[CIF_HANDLER_IN+LOW(1)]); +} + +phandle +OFParent(phandle device_id) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"parent", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"parent", 1,1,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = device_id; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle)argarray[CIF_HANDLER_IN+LOW(1)]); +} + +long +OFGetproplen( + phandle device_id, + char *name + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"getproplen", 0,2, 0,1, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"getproplen", 2,1,0,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = (long)device_id; + argarray[CIF_HANDLER_IN+LOW(1)] = (long)name; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+LOW(2)]); +} + +long +OFGetprop( + phandle device_id, + char *name, + char *buf, + ULONG buflen + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"getprop", 0,4, 0,1, 0,0, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"getprop", 4,1,0,0,0,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = (long)device_id; + argarray[CIF_HANDLER_IN+LOW(1)] = (long)name; + argarray[CIF_HANDLER_IN+LOW(2)] = (long)buf; + argarray[CIF_HANDLER_IN+LOW(3)] = buflen; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+LOW(4)]); +} + +long +OFNextprop( + phandle device_id, + char *name, + char *buf + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"nextprop", 0,3, 0,1, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"nextprop", 3,1,0,0,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = (long)device_id; + argarray[CIF_HANDLER_IN+LOW(1)] = (long)name; + argarray[CIF_HANDLER_IN+LOW(2)] = (long)buf; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+LOW(3)]); +} + +long +OFSetprop( + phandle device_id, + char *name, + char *buf, + ULONG buflen + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"setprop", 0,4, 0,1, 0,0, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"setprop", 4,1,0,0,0,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = (long)device_id; + argarray[CIF_HANDLER_IN+LOW(1)] = (long)name; + argarray[CIF_HANDLER_IN+LOW(2)] = (long)buf; + argarray[CIF_HANDLER_IN+LOW(3)] = buflen; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+LOW(4)]); +} + +phandle +OFFinddevice( char *devicename) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"finddevice", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"finddevice", 1,1,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (long)devicename; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle) argarray[CIF_HANDLER_IN+LOW(1)]); +} + +ihandle +OFOpen( char *devicename) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"open", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"open", 1,1,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (long)devicename; + if (call_firmware(argarray) != 0) + { + return (ihandle)0; + } + return ((ihandle) argarray[CIF_HANDLER_IN+LOW(1)]); +} + +void +OFClose(ihandle id) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"close", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"close", 1,1,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = (long)id; + if (call_firmware(argarray) != 0) + { +#ifdef notdef + warn("OFClose(%x) failed\n", id); +#endif + } + +} + +long +OFRead( + ihandle instance_id, + char *addr, + ULONG len + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"read", 0,3, 0,1, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"read", 3,1,0,0,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (long) instance_id; + argarray[CIF_HANDLER_IN+LOW(1)] = (cell_t)addr; + argarray[CIF_HANDLER_IN+LOW(2)] = len; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+LOW(3)]); +} + +long +OFWrite( + ihandle instance_id, + char *addr, + ULONG len + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"write", 0,3, 0,1, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"write", 3,1,0,0,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (long) instance_id; + argarray[CIF_HANDLER_IN+LOW(1)] = (cell_t)addr; + argarray[CIF_HANDLER_IN+LOW(2)] = len; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+LOW(3)]); +} + +long +OFSeek( + ihandle instance_id, + ULONG poshi, + ULONG poslo + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"seek", 0,3, 0,1, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"seek", 3,1,0,0,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (long) instance_id; + argarray[CIF_HANDLER_IN+LOW(1)] = poshi; + argarray[CIF_HANDLER_IN+LOW(2)] = poslo; + if (call_firmware(argarray) != 0) { + return (-1); + } + return (argarray[CIF_HANDLER_IN+LOW(3)]); +} + +ULONG +OFClaim( + char *addr, + ULONG size, + ULONG align + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"claim", 0,3, 0,1, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"claim", 3,1,0,0,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)addr; + argarray[CIF_HANDLER_IN+LOW(1)] = size; + argarray[CIF_HANDLER_IN+LOW(2)] = align; + if (call_firmware(argarray) != 0) + { + return (ULONG)0; + } + return (argarray[CIF_HANDLER_IN+LOW(3)]); +} + +VOID +OFRelease( + char *addr, + ULONG size + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"release", 0,2, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"release", 2,0,0,0}; +#endif + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)addr; + argarray[CIF_HANDLER_IN+LOW(1)] = size; + call_firmware(argarray); +} + +long +OFPackageToPath( + phandle device_id, + char *addr, + ULONG buflen + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"package-to-path", 0,3, 0,1, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"package-to-path", 3,1,0,0,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)device_id; + argarray[CIF_HANDLER_IN+LOW(1)] = (cell_t)addr; + argarray[CIF_HANDLER_IN+LOW(2)] = buflen; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+LOW(3)]); +} + +phandle +OFInstanceToPackage(ihandle ih) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"instance-to-package", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"instance-to-package", 1,1,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)ih; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+LOW(1)]); +} + +long +OFCallMethod( + char *method, + ihandle id, + ULONG arg + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"call-method", 0,3, 0,1, 0,0, 0,0, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"call-method", 3,1,0,0,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)method; + argarray[CIF_HANDLER_IN+LOW(1)] = (cell_t)id; + argarray[CIF_HANDLER_IN+LOW(2)] = arg; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+LOW(3)]); +} + +long +OFInterpret0( + char *cmd + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"interpret", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"interpret", 1,1,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)cmd; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+LOW(1)]); +} + +ULONG +OFMilliseconds( VOID ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"milliseconds", 0,0, 0,1, 0,0}; +#else + cell_t argarray[] = { (cell_t)"milliseconds", 0,1,0}; +#endif + if (call_firmware(argarray) != 0) + { + return (ULONG)0; + } + return (argarray[CIF_HANDLER_IN+LOW(0)]); +} + +void (*OFSetCallback(void (*func)(void)))(void) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"set-callback", 0,1, 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"set-callback", 1,1,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)func; + if (call_firmware(argarray) != 0) + { + return (NULL); + } + return ((void (*)(void))argarray[CIF_HANDLER_IN+LOW(1)]); +} + +long +OFBoot( + char *bootspec + ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"boot", 0,1, 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"boot", 1,0,0}; +#endif + + argarray[CIF_HANDLER_IN+LOW(0)] = (cell_t)bootspec; + call_firmware(argarray); +} + +VOID +OFEnter( VOID ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"enter", 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"enter", 0,0}; +#endif + + call_firmware(argarray); +} + +/* volatile VOID */ + VOID +OFExit( VOID ) +{ +#ifdef CIF64 + ULONG argarray[] = { 0,(ULONG)"exit", 0,0, 0,0}; +#else + cell_t argarray[] = { (cell_t)"exit", 0,0}; +#endif + call_firmware(argarray); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers64.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers64.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers64.c Thu Aug 23 18:16:28 2007 @@ -1,0 +1,434 @@ +// See license at end of file + +/*++ + +Abstract: + + This module implements the wrapper for the P1275 boot firmware client + program interface. There is a wrapper routine for each of the client + interface service. The wrapper routine constructs a client interface + argument array as illustraed in the figure below, places its address + in r3 and transfers control to the client interface handler. The + return address of the wrapper routine is placed in lr register. + + The Client interface handler performs the service specified in the + argument array and return to wrapper routine which in turn return + to the client program. The client interface handler returns an + overall success or failure code to the caller as a subroutine + return value (%o0 for SPARC, %r3 for PowerPC, %eax for x86). + + + Layout of the argument array + + +--------------------------------------+ + | Name of the client interface service | + +--------------------------------------+ + | Number of input arguments | + +--------------------------------------+ + | Number of return values | + +--------------------------------------+ + | Input arguments (arg1, ..., argN) | + +--------------------------------------+ + | Returned values (ret1, ..., retN) | + +--------------------------------------+ + +--*/ + +#include "1275.h" +extern int call_firmware(ULONG *); +extern void warn(char *fmt, ...); + +#define CIF_HANDLER_IN 3 + +// Device tree routines + +// Peer() - This routines outputs the identifier(phandle) of the device node that is +// the next sibling of the specified device node. +// +// Inputs: +// phandle - identifier of a device node +// +// Outputs: +// sibling_phandle - identifier of the next sibling. +// Zero if there are no more siblings. + +phandle +OFPeer(phandle device_id) +{ + ULONG argarray[] = { (ULONG)"peer",1,1,0,0}; + argarray[CIF_HANDLER_IN+0] = device_id; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle)argarray[CIF_HANDLER_IN+1]); +} + +phandle +OFChild(phandle device_id) +{ + ULONG argarray[] = { (ULONG)"child",1,1,0,0}; + argarray[CIF_HANDLER_IN+0] = device_id; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle)argarray[CIF_HANDLER_IN+1]); +} + +phandle +OFParent(phandle device_id) +{ + ULONG argarray[] = { (ULONG)"parent",1,1,0,0}; + argarray[CIF_HANDLER_IN+0] = device_id; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle)argarray[CIF_HANDLER_IN+1]); +} + +long +OFGetproplen( + phandle device_id, + char *name + ) +{ + ULONG argarray[] = { (ULONG)"getproplen",2,1,0,0,0}; + argarray[CIF_HANDLER_IN+0] = (long)device_id; + argarray[CIF_HANDLER_IN+1] = (long)name; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+2]); +} + +long +OFGetprop( + phandle device_id, + char *name, + char *buf, + ULONG buflen + ) +{ + ULONG argarray[] = { (ULONG)"getprop",4,1,0,0,0,0,0}; + argarray[CIF_HANDLER_IN+0] = (long)device_id; + argarray[CIF_HANDLER_IN+1] = (long)name; + argarray[CIF_HANDLER_IN+2] = (long)buf; + argarray[CIF_HANDLER_IN+3] = buflen; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+4]); +} + +long +OFNextprop( + phandle device_id, + char *name, + char *buf + ) +{ + ULONG argarray[] = { (ULONG)"nextprop",3,1,0,0,0,0}; + argarray[CIF_HANDLER_IN+0] = (long)device_id; + argarray[CIF_HANDLER_IN+1] = (long)name; + argarray[CIF_HANDLER_IN+2] = (long)buf; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+3]); +} + +long +OFSetprop( + phandle device_id, + char *name, + char *buf, + ULONG buflen + ) +{ + ULONG argarray[] = { (ULONG)"setprop",4,1,0,0,0,0,0}; + argarray[CIF_HANDLER_IN+0] = (long)device_id; + argarray[CIF_HANDLER_IN+1] = (long)name; + argarray[CIF_HANDLER_IN+2] = (long)buf; + argarray[CIF_HANDLER_IN+3] = buflen; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+4]); +} + +phandle +OFFinddevice( char *devicename) +{ + ULONG argarray[] = { (ULONG)"finddevice",1,1,0,0}; + + argarray[CIF_HANDLER_IN+0] = (long)devicename; + if (call_firmware(argarray) != 0) + { + return (phandle)0; + } + return ((phandle) argarray[CIF_HANDLER_IN+1]); +} + +ihandle +OFOpen( char *devicename) +{ + ULONG argarray[] = { (ULONG)"open",1,1,0,0}; + + argarray[CIF_HANDLER_IN+0] = (long)devicename; + if (call_firmware(argarray) != 0) + { + return (ihandle)0; + } + return ((ihandle) argarray[CIF_HANDLER_IN+1]); +} + +void +OFClose(ihandle id) +{ + ULONG argarray[] = { (ULONG)"close",1,1,0,0}; + argarray[CIF_HANDLER_IN+0] = (long)id; + if (call_firmware(argarray) != 0) + { +#ifdef notdef + warn("OFClose(%x) failed\n", id); +#endif + } + +} + +long +OFRead( + ihandle instance_id, + char *addr, + ULONG len + ) +{ + ULONG argarray[] = { (ULONG)"read",3,1,0,0,0,0}; + + argarray[CIF_HANDLER_IN+0] = (long) instance_id; + argarray[CIF_HANDLER_IN+1] = (ULONG)addr; + argarray[CIF_HANDLER_IN+2] = len; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+3]); +} + +long +OFWrite( + ihandle instance_id, + char *addr, + ULONG len + ) +{ + ULONG argarray[] = { (ULONG)"write",3,1,0,0,0,0}; + + argarray[CIF_HANDLER_IN+0] = (long) instance_id; + argarray[CIF_HANDLER_IN+1] = (ULONG)addr; + argarray[CIF_HANDLER_IN+2] = len; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return (argarray[CIF_HANDLER_IN+3]); +} + +long +OFSeek( + ihandle instance_id, + ULONG poshi, + ULONG poslo + ) +{ + ULONG argarray[] = { (ULONG)"seek",3,1,0,0,0,0}; + + argarray[CIF_HANDLER_IN+0] = (long) instance_id; + argarray[CIF_HANDLER_IN+1] = poshi; + argarray[CIF_HANDLER_IN+2] = poslo; + if (call_firmware(argarray) != 0) { + return (-1); + } + return (argarray[CIF_HANDLER_IN+3]); +} + +ULONG +OFClaim( + char *addr, + ULONG size, + ULONG align + ) +{ + ULONG argarray[] = { (ULONG)"claim",3,1,0,0,0,0}; + + argarray[CIF_HANDLER_IN+0] = (ULONG)addr; + argarray[CIF_HANDLER_IN+1] = size; + argarray[CIF_HANDLER_IN+2] = align; + if (call_firmware(argarray) != 0) + { + return (ULONG)0; + } + return (argarray[CIF_HANDLER_IN+3]); +} + +VOID +OFRelease( + char *addr, + ULONG size + ) +{ + ULONG argarray[] = { (ULONG)"release",2,0,0,0}; + argarray[CIF_HANDLER_IN+0] = (ULONG)addr; + argarray[CIF_HANDLER_IN+1] = size; + call_firmware(argarray); +} + +long +OFPackageToPath( + phandle device_id, + char *addr, + ULONG buflen + ) +{ + ULONG argarray[] = { (ULONG)"package-to-path",3,1,0,0,0,0}; + + argarray[CIF_HANDLER_IN+0] = (ULONG)device_id; + argarray[CIF_HANDLER_IN+1] = (ULONG)addr; + argarray[CIF_HANDLER_IN+2] = buflen; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+3]); +} + +phandle +OFInstanceToPackage(ihandle ih) +{ + ULONG argarray[] = { (ULONG)"instance-to-package",1,1,0,0}; + + argarray[CIF_HANDLER_IN+0] = (ULONG)ih; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+1]); +} + +long +OFCallMethod( + char *method, + ihandle id, + ULONG arg + ) +{ + ULONG argarray[] = { (ULONG)"call-method",3,1,0,0,0,0}; + + argarray[CIF_HANDLER_IN+0] = (ULONG)method; + argarray[CIF_HANDLER_IN+1] = (ULONG)id; + argarray[CIF_HANDLER_IN+2] = arg; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+3]); +} + +long +OFInterpret0( + char *cmd + ) +{ + ULONG argarray[] = { (ULONG)"interpret",1,1,0,0}; + + argarray[CIF_HANDLER_IN+0] = (ULONG)cmd; + if (call_firmware(argarray) != 0) + { + return (-1); + } + return ((LONG)argarray[CIF_HANDLER_IN+1]); +} + +ULONG +OFMilliseconds( VOID ) +{ + ULONG argarray[] = { (ULONG)"milliseconds",0,1,0}; + if (call_firmware(argarray) != 0) + { + return (ULONG)0; + } + return (argarray[CIF_HANDLER_IN+0]); +} + +void (*OFSetCallback(void (*func)(void)))(void) +{ + ULONG argarray[] = { (ULONG)"set-callback",1,1,0,0}; + + argarray[CIF_HANDLER_IN+0] = (ULONG)func; + if (call_firmware(argarray) != 0) + { + return (NULL); + } + return ((void (*)(void))argarray[CIF_HANDLER_IN+1]); +} + +long +OFBoot( + char *bootspec + ) +{ + ULONG argarray[] = { (ULONG)"boot",1,0,0}; + + argarray[CIF_HANDLER_IN+0] = (ULONG)bootspec; + call_firmware(argarray); +} + +VOID +OFEnter( VOID ) +{ + ULONG argarray[] = { (ULONG)"enter",0,0}; + + call_firmware(argarray); +} + +/* volatile VOID */ + VOID +OFExit( VOID ) +{ +#ifdef DEBUG + ULONG argarray[] = { (ULONG)"enter",0,0}; +#else + ULONG argarray[] = { (ULONG)"exit",0,0}; +#endif + call_firmware(argarray); +} + +// LICENSE_BEGIN +// Copyright (c) 2006 FirmWorks +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/wrappers64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/x86/makefile URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/x86/makefile (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/x86/makefile Thu Aug 23 18:16:28 2007 @@ -1,0 +1,70 @@ +# This makefile has been tested on a FreeBSD 2.2.5 system with GCC + +# -fno-builtin has the effect of suppressing some warnings about +# functions that conflict with gcc builtins +CC=gcc +CFLAGS=-g -fno-builtin + +all: libobp.a hello.elf start.o + +# Create a library file containing all the library routines + +libobp.a: lib.o printf.o wrappers.o malloc.o strings.o printf.o debug.o main.o intprop.o regprop.o strprop.o mem.o + ar rcv libobp.a lib.o malloc.o wrappers.o strings.o printf.o debug.o main.o intprop.o regprop.o strprop.o mem.o + ranlib libobp.a + +# Build machine-independent library routines + +main.o: ../main.c + ${CC} ${CFLAGS} -c ../main.c + +lib.o: ../lib.c + ${CC} ${CFLAGS} -c ../lib.c + +printf.o: ../printf.c + ${CC} ${CFLAGS} -c ../printf.c + +debug.o: ../debug.c + ${CC} ${CFLAGS} -c ../debug.c + +strings.o: ../strings.c + ${CC} ${CFLAGS} -c ../strings.c + +mem.o: ../mem.c + ${CC} ${CFLAGS} -c ../mem.c + +intprop.o: ../intprop.c + ${CC} ${CFLAGS} -c ../intprop.c + +regprop.o: ../regprop.c + ${CC} ${CFLAGS} -c ../regprop.c + +strprop.o: ../strprop.c + ${CC} ${CFLAGS} -c ../strprop.c + +wrappers.o: ../wrappers.c + ${CC} ${CFLAGS} -c ../wrappers.c + +malloc.o: ../malloc.c + ${CC} ${CFLAGS} -c ../malloc.c + +# Build processor-specific startup code and call gateway + +start.o: start.s + ${CC} ${CFLAGS} -c start.s + +# Hello is a demo program that uses the stdio library + +hello.elf: libobp.a start.o ofwboot.o freeldr_ofw.o + ld -nostdlib -Bstatic -N -Ttext 0x100000 -o $@ start.o ofwboot.o freeldr_ofw.o libobp.a freeldr.elf + +ofwboot.o: ../../ofwboot.c + ${CC} ${CFLAGS} -c ../../ofwboot.c + +freeldr_ofw.o: ../../freeldr_ofw.o + ${CC} ${CFLAGS} -c ../../freeldr_ofw.c + + + +clean: + rm *.o hello* *.a Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/ofwstub/source/x86/makefile ------------------------------------------------------------------------------ svn:eol-style = native

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