Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[sedwards] 13905: remove some backup files created by editplus

by sedwards＠svn.reactos.com

remove some backup files created by editplus Deleted: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak Deleted: trunk/rosapps/games/solitaire/cardlib/cardrgnmouse.cpp.bak _____ Deleted: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak --- trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak 2005-03-10 04:04:27 UTC (rev 13904) +++ trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak 2005-03-10 04:05:53 UTC (rev 13905) @@ -1,489 +0,0 @@ -// -// CardLib - CardButton class -// -// Freeware -// Copyright J Brown 2001 -// -#include <windows.h> -#include <tchar.h> - -#include "cardlib.h" -#include "cardwindow.h" -#include "cardbutton.h" -#include "cardcolor.h" - -HPALETTE UseNicePalette(HDC, HPALETTE); -void RestorePalette(HDC, HPALETTE); - -void PaintRect(HDC hdc, RECT *rect, COLORREF colour); - -CardButton::CardButton(CardWindow &parent, int Id, TCHAR *szText, UINT Style, bool visible, - int x, int y, int width, int height) - - : parentWnd(parent), id(Id), fVisible(visible), uStyle(Style), ButtonCallback(0) -{ - crText = RGB(255,255,255); - crBack = RGB(0, 128, 0); - - xadjust = 0; - yadjust = 0; - xjustify = 0; - yjustify = 0; - - fMouseDown = false; - fButtonDown = false; - - hIcon = 0; - - SetText(szText); - Move(x, y, width, height); - - mxlock = CreateMutex(0, FALSE, 0); - - hFont = 0; -} - -CardButton::~CardButton() -{ - CloseHandle(mxlock); -} - -void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal) -{ - RECT fill; - - HANDLE hOld; - - HPEN hhi = CreatePen(0, 0, MAKE_PALETTERGB(crHighlight)); - HPEN hsh = CreatePen(0, 0, MAKE_PALETTERGB(crShadow)); - HPEN hbl = (HPEN)GetStockObject(BLACK_PEN); - - int x = rect->left; - int y = rect->top; - int width = rect->right-rect->left - 1; - int height = rect->bottom-rect->top - 1; - - SetRect(&fill, x+1, y+1, x+width-1, y+height-1); - - int one = 1; - - if(!fNormal) - { - x += width; - y += height; - width = -width; - height = -height; - one = -1; - OffsetRect(&fill, 1, 1); - } - - if(fNormal) - hOld = SelectObject(hdc, hhi); - else - hOld = SelectObject(hdc, hhi); - - MoveToEx(hdc, x, y+height, 0); - LineTo(hdc, x, y); - LineTo(hdc, x+width, y); - SelectObject(hdc, hOld); - - hOld = SelectObject(hdc, hbl); - LineTo(hdc, x+width, y+height); - LineTo(hdc, x-one, y+height); - SelectObject(hdc, hOld); - - hOld = SelectObject(hdc, hsh); - MoveToEx(hdc, x+one, y+height-one, 0); - LineTo(hdc, x+width-one, y+height-one); - LineTo(hdc, x+width-one, y); - SelectObject(hdc, hOld); - - PaintRect(hdc, &fill, MAKE_PALETTERGB(crBack)); - - DeleteObject(hhi); - DeleteObject(hsh); -} - -void CardButton::Clip(HDC hdc) -{ - if(fVisible == false) return; - - ExcludeClipRect(hdc, rect.left, rect.top, rect.right, rect.bottom); -} - -void CardButton::Draw(HDC hdc, bool fNormal) -{ - SIZE textsize; - int x, y; //text x, y - int ix, iy; //icon x, y - int iconwidth = 0; - - RECT cliprect; - - if(fVisible == 0) return; - - if(hFont == 0) - SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); - else - SelectObject(hdc, hFont); - - GetTextExtentPoint32(hdc, szText, lstrlen(szText), &textsize); - - if(hIcon) - { - x = rect.left + 32 + 8; - } - else - { - if(uStyle & CB_ALIGN_LEFT) - { - x = rect.left + iconwidth; - } - else if(uStyle & CB_ALIGN_RIGHT) - { - x = rect.left + (rect.right-rect.left-iconwidth-textsize.cx); - } - else //centered - { - x = rect.right - rect.left - iconwidth; - x = (x - textsize.cx) / 2; - x += rect.left + iconwidth; - } - } - - y = rect.bottom - rect.top; - y = (y - textsize.cy) / 2; - y += rect.top; - - //calc icon position.. - ix = rect.left + 4; - iy = rect.top + (rect.bottom-rect.top-32) / 2; - - //if button is pressed, then shift text - if(fNormal == false && (uStyle & CB_PUSHBUTTON)) - { - x += 1; - y += 1; - ix += 1; - iy += 1; - } - - SetRect(&cliprect, x, y, x+textsize.cx, y+textsize.cy); - ExcludeClipRect(hdc, x, y, x+textsize.cx, y+textsize.cy); - - // - // Calc icon pos - // - - if(hIcon) - { - ExcludeClipRect(hdc, ix, iy, ix + 32, iy + 32); - } - - if(uStyle & CB_PUSHBUTTON) - { - DrawRect(hdc, &rect, fNormal); - - SetBkColor(hdc, MAKE_PALETTERGB(crBack)); - SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); - - SelectClipRgn(hdc, 0); - - ExtTextOut(hdc, x, y, ETO_OPAQUE, &cliprect, szText, lstrlen(szText), 0); - } - else - { - SetBkColor(hdc, MAKE_PALETTERGB(crBack)); - SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); - - SelectClipRgn(hdc, 0); - - ExtTextOut(hdc, x, y, ETO_OPAQUE, &rect, szText, lstrlen(szText), 0); - } - - if(hIcon) - { - HBRUSH hbr = CreateSolidBrush(MAKE_PALETTERGB(crBack)); - DrawIconEx(hdc, ix, iy, hIcon, 32, 32, 0, hbr, 0); - DeleteObject(hbr); - } - -} - -void CardButton::AdjustPosition(int winwidth, int winheight) -{ - int width = rect.right-rect.left; - int height = rect.bottom-rect.top; - - width = width & ~0x1; - - switch(xjustify) - { - case CS_XJUST_NONE: - break; - - case CS_XJUST_CENTER: //centered - rect.left = (winwidth - (width)) / 2; - rect.left += xadjust; - rect.right = rect.left+width; - break; - - case CS_XJUST_RIGHT: //right-aligned - rect.left = winwidth - width; - rect.left += xadjust; - rect.right = rect.left+width; - break; - } - - switch(yjustify) - { - case CS_YJUST_NONE: - break; - - case CS_YJUST_CENTER: //centered - rect.top = (winheight - (height)) / 2; - rect.top += yadjust; - rect.bottom = rect.top+height; - break; - - case CS_YJUST_BOTTOM: //right-aligned - rect.top = winheight - height; - rect.top += yadjust; - rect.bottom = rect.top+height; - break; - } - -} - -int CardButton::OnLButtonDown(HWND hwnd, int x, int y) -{ - if((uStyle & CB_PUSHBUTTON) == 0) - return 0; - - //make sure that the user is allowed to do something - if(WaitForSingleObject(mxlock, 0) != WAIT_OBJECT_0) - { - return 0; - } - else - { - ReleaseMutex(mxlock); - } - - fMouseDown = true; - fButtonDown = true; - - Redraw(); - - SetCapture(hwnd); - - return 1; -} - -int CardButton::OnMouseMove(HWND hwnd, int x, int y) -{ - if(fMouseDown) - { - bool fOldButtonDown = fButtonDown; - - POINT pt; - - pt.x = x; - pt.y = y; - - if(PtInRect(&rect, pt)) - fButtonDown = true; - else - fButtonDown = false; - - if(fButtonDown != fOldButtonDown) - Redraw(); - } - - return 0; -} - -int CardButton::OnLButtonUp(HWND hwnd, int x, int y) -{ - if(fMouseDown) - { - fMouseDown = false; - fButtonDown = false; - - if(uStyle & CB_PUSHBUTTON) - { - Redraw(); - ReleaseCapture(); - } - - //if have clicked the button - if(parentWnd.CardButtonFromPoint(x, y) == this) - { - if(ButtonCallback) - { - ButtonCallback(*this); - } - else - { - HWND hwnd = (HWND)parentWnd; - SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd); - } - } - } - - return 0; -} - -#define _countof(array) (sizeof(array)/sizeof(array[0])) - -CardButton *CardWindow::CreateButton(int id, TCHAR *szText, UINT uStyle, bool fVisible, int x, int y, int width, int height) -{ - CardButton *cb; - - if(nNumButtons == MAXBUTTONS) - return 0; - - cb = new CardButton(*this, id, szText, uStyle, fVisible, x, y, width, height); - Buttons[nNumButtons++] = cb; - - if(uStyle & CB_PUSHBUTTON) - { - cb->SetBackColor(CardButton::GetFace(crBackgnd)); - //cb->SetBackColor(ScaleLumRGB(crBackgnd, 0.1)); - cb->SetForeColor(RGB(255,255,255)); - } - else - { - cb->SetBackColor(crBackgnd); - cb->SetForeColor(RGB(255,255,255)); - } - - return cb; -} - -void CardButton::SetText(TCHAR *lpszFormat, ...) -{ - int count; - - va_list args; - va_start(args, lpszFormat); - - count = wvsprintf(szText, lpszFormat, args); - va_end(args); -} - -int CardButton::Id() -{ - return id; -} - -void CardButton::Show(bool fShow) -{ - fVisible = fShow; -} - -void CardButton::Move(int x, int y, int width, int height) -{ - SetRect(&rect, x, y, x+width, y+height); -} - -void CardButton::Redraw() -{ - HDC hdc = GetDC((HWND)parentWnd); - - HPALETTE hOldPal = UseNicePalette(hdc, __hPalette); - - Draw(hdc, !fButtonDown); - - RestorePalette(hdc, hOldPal); - - ReleaseDC((HWND)parentWnd, hdc); -} - -void CardButton::SetForeColor(COLORREF cr) -{ - crText = cr; -} - -void CardButton::SetBackColor(COLORREF cr) -{ - crBack = cr; - - crHighlight = GetHighlight(cr); - crShadow = GetShadow(cr); - - //crHighlight = ScaleLumRGB(cr, +0.25); - //crShadow = ScaleLumRGB(cr, -0.25); -} - -// Static member -COLORREF CardButton::GetHighlight(COLORREF crBase) -{ - return ColorScaleRGB(crBase, RGB(255,255,255), 0.25); -} - -// Static member -COLORREF CardButton::GetShadow(COLORREF crBase) -{ - return ColorScaleRGB(crBase, RGB(0, 0, 0), 0.25); -} - -COLORREF CardButton::GetFace(COLORREF crBase) -{ - return ColorScaleRGB(crBase, RGB(255,255,255), 0.1); -} - -void CardButton::SetPlacement(UINT xJustify, UINT yJustify, int xAdjust, int yAdjust) -{ - xadjust = xAdjust; - yadjust = yAdjust; - xjustify = xJustify; - yjustify = yJustify; -} - -void CardButton::SetIcon(HICON hicon, bool fRedraw) -{ - hIcon = hicon; - - if(fRedraw) - Redraw(); -} - -void CardButton::SetFont(HFONT font) -{ - //don't delete the existing font.. - hFont = font; -} - -void CardButton::SetButtonProc(pButtonProc proc) -{ - ButtonCallback = proc; -} - -bool CardButton::Lock() -{ - DWORD dw = WaitForSingleObject(mxlock, 0); - - if(dw == WAIT_OBJECT_0) - return true; - else - return false; -} - -bool CardButton::UnLock() -{ - if(ReleaseMutex(mxlock)) - return true; - else - return false; -} - -void CardButton::SetStyle(UINT style) -{ - uStyle = style; -} - -UINT CardButton::GetStyle() -{ - return uStyle; -} \ No newline at end of file _____ Deleted: trunk/rosapps/games/solitaire/cardlib/cardrgnmouse.cpp.bak --- trunk/rosapps/games/solitaire/cardlib/cardrgnmouse.cpp.bak 2005-03-10 04:04:27 UTC (rev 13904) +++ trunk/rosapps/games/solitaire/cardlib/cardrgnmouse.cpp.bak 2005-03-10 04:05:53 UTC (rev 13905) @@ -1,618 +0,0 @@ -// -// CardLib - CardRegion mouse-related stuff -// -// Freeware -// Copyright J Brown 2001 -// -#include <windows.h> -#include <math.h> - -#include "cardlib.h" -#include "cardwindow.h" -#include "cardregion.h" - -double __CARDZOOMSPEED = 32; - -int ClipCard(HDC hdc, int x, int y, int width, int height); -void DrawCard(HDC hdc, int x, int y, HDC hdcSource, int width, int height); - -#ifdef _DEBUG - -static pDebugClickProc DebugStackClickProc = 0; - -void CardLib_SetStackClickProc(pDebugClickProc proc) -{ - DebugStackClickProc = proc; -} - -#endif - -CardRegion *CardWindow::GetBestStack(int x, int y, int w, int h) -{ - int maxoverlap = 0; - int maxoverlapidx = -1; - - //find the stack which is most covered by the dropped - //cards. Only include those which allow drops. - // - for(int i = 0; i < nNumCardRegions; i++) - { - int percent = Regions[i]->GetOverlapRatio(x, y, w, h); - - //if this stack has the biggest coverage yet - if(percent > maxoverlap && Regions[i]->IsVisible()) - { - maxoverlap = percent; - maxoverlapidx = i; - } - } - - //if we found a stack to drop onto - if(maxoverlapidx != -1) - { - return Regions[maxoverlapidx]; - } - else - { - return 0; - } -} - -bool CardRegion::IsPointInStack(int x, int y) -{ - int axpos = xoffset < 0 ? xpos + (nNumApparentCards-1)*xoffset : xpos; - int aypos = yoffset < 0 ? ypos + (nNumApparentCards-1)*yoffset : ypos; - - if(x >= axpos && x < axpos + width && y >= aypos && y < aypos + height && fVisible) - return true; - else - return false; -} - -int CardRegion::GetNumDragCards(int x, int y) -{ - int cardindex = 0; //index from stack start - int maxidx; - - //make x,y relative to the stack's upper left corner - x -= xpos + (xoffset < 0 ? (nNumApparentCards/*cardstack.NumCards()*/ - 1) * xoffset : 0); - y -= ypos + (yoffset < 0 ? (nNumApparentCards/*cardstack.NumCards()*/ - 1) * yoffset : 0); - - //if stack is empty, cannot drag any cards from it - if(cardstack.NumCards() <= 0) - return 0; - - //see which card in the stack has been clicked on - //top-bottom ordering - if(yoffset > 0) - { - if(y < height - __cardheight) - cardindex = y / yoffset; - else - cardindex = cardstack.NumCards() - 1; - } - else if(yoffset < 0) - { - if(y < __cardheight) - cardindex = cardstack.NumCards() - 1; - else - cardindex = cardstack.NumCards() - ((y - __cardheight) / -yoffset) - 2; - } - else //yoffset == 0 - { - cardindex = cardstack.NumCards() - 1; - } - - maxidx = cardindex; - - //if left-right - if(xoffset > 0) - { - if(x < width - __cardwidth) - cardindex = x / xoffset; - else - cardindex = cardstack.NumCards() - 1; - } - else if(xoffset < 0) - { - if(x < __cardwidth) - cardindex = cardstack.NumCards() - 1; - else - cardindex = cardstack.NumCards() - ((x - __cardwidth) / -xoffset) - 2; - } - else - { - cardindex = cardstack.NumCards() - 1; - } - - if(cardindex > maxidx) cardindex = maxidx; - - if(cardindex > cardstack.NumCards()) - cardindex = 1; - - //if are trying to drag too many cards at once - return cardstack.NumCards() - cardindex; -} - -bool CardRegion::CanDragCards(int iNumCards) -{ - if(iNumCards <= 0) return false; - if(nThreedCount > 1 && iNumCards > 1) return false; - - if(WaitForSingleObject(mxlock, 0) != WAIT_OBJECT_0) - { -// TRACE("Failed to gain access to card stack\n"); - return false; - } - - ReleaseMutex(mxlock); - - switch(uDragRule) - { - case CS_DRAG_ALL: - return true; - - case CS_DRAG_TOP: - - if(iNumCards == 1) - return true; - else - return false; - - case CS_DRAG_NONE: - return false; - - case CS_DRAG_CALLBACK: - - if(CanDragCallback) - { - return CanDragCallback(*this, iNumCards); - } - else - { - return false; - } - - default: - return false; - } -} - -bool CardRegion::CanDropCards(CardStack &cards) -{ - if(WaitForSingleObject(mxlock, 0) != WAIT_OBJECT_0) - { - return false; - } - - ReleaseMutex(mxlock); - - switch(uDropRule) - { - case CS_DROP_ALL: - return true; - - case CS_DROP_NONE: - return false; - - case CS_DROP_CALLBACK: - - if(CanDropCallback) - { - return CanDropCallback(*this, cards); - } - else - { - return false; - } - - default: - return false; - } -} - -bool CardRegion::OnLButtonDblClk(int x, int y) -{ - iNumDragCards = GetNumDragCards(x, y); - - if(DblClickCallback) - DblClickCallback(*this, iNumDragCards); - - return true; -} - -bool CardRegion::OnLButtonDown(int x, int y) -{ - iNumDragCards = GetNumDragCards(x, y); - -#ifdef _DEBUG - if(DebugStackClickProc) - { - if(!DebugStackClickProc(*this)) - return false; - } -#endif - - if(ClickCallback) - ClickCallback(*this, iNumDragCards); - - if(CanDragCards(iNumDragCards) != false) - { - - //offset of the mouse cursor relative to the top-left corner - //of the cards that are being dragged - mousexoffset = x - xpos - xoffset * (nNumApparentCards - iNumDragCards); - mouseyoffset = y - ypos - yoffset * (nNumApparentCards - iNumDragCards); - - if(xoffset < 0) - mousexoffset += -xoffset * (iNumDragCards - 1); - - if(yoffset < 0) - mouseyoffset += -yoffset * (iNumDragCards - 1); - - //remove the cards from the source stack - dragstack = cardstack.Pop(iNumDragCards); - - //prepare the back buffer, and the drag image - PrepareDragBitmaps(iNumDragCards); - - oldx = x - mousexoffset; - oldy = y - mouseyoffset; - - Update(); //Update this stack's card count + size - - SetCapture((HWND)parentWnd); - - //set AFTER settings the dragstack... - fMouseDragging = true; - - return true; - } - - return false; -} - -bool CardRegion::OnLButtonUp(int x, int y) -{ - CardRegion *pDestStack = 0; - HDC hdc; - int dropstackid = CS_DROPZONE_NODROP; - - RECT dragrect; - DropZone *dropzone; - - fMouseDragging = false; - - //first of all, see if any drop zones have been registered - SetRect(&dragrect, x-mousexoffset, y-mouseyoffset, x-mousexoffset+nDragCardWidth, y-mouseyoffset+nDragCardHeight); - - dropzone = parentWnd.GetDropZoneFromRect(&dragrect); - - if(dropzone) - { - dropstackid = dropzone->DropCards(dragstack); - - if(dropstackid != CS_DROPZONE_NODROP) - pDestStack = parentWnd.CardRegionFromId(dropstackid); - else - pDestStack = 0; - } - else - { - pDestStack = parentWnd.GetBestStack(x - mousexoffset, y - mouseyoffset, nDragCardWidth, nDragCardHeight); - } - - // If have found a stack to drop onto - // - if(pDestStack && pDestStack->CanDropCards(dragstack)) - { - hdc = GetDC((HWND)parentWnd); - // UseNicePalette(hdc); - ZoomCard(hdc, x - mousexoffset, y - mouseyoffset, pDestStack); - ReleaseDC((HWND)parentWnd, hdc); - - // - //add the cards to the destination stack - // - CardStack temp = pDestStack->GetCardStack(); - temp.Push(dragstack); - - pDestStack->SetCardStack(temp); -// pDestStack->Update(); //Update this stack's card count + size -// pDestStack->UpdateFaceDir(temp); - - // Call the remove callback on THIS stack, if one is specified - // - if(RemoveCallback) - RemoveCallback(*this, iNumDragCards); - - // Call the add callback, if one is specified - // - if(pDestStack->AddCallback) - pDestStack->AddCallback(*pDestStack, pDestStack->cardstack);//index, deststack->numcards); - - RedrawIfNotDim(pDestStack, true); - } - - // - // Otherwise, let the cards snap back onto this stack - // - else - { - - hdc = GetDC((HWND)parentWnd); - ZoomCard(hdc, x - mousexoffset, y - mouseyoffset, this); - cardstack += dragstack; - ReleaseDC((HWND)parentWnd, hdc); - - Update(); //Update this stack's card count + size - } - - ReleaseDragBitmaps(); - ReleaseCapture(); - - return true; -} - -bool CardRegion::OnMouseMove(int x, int y) -{ - HDC hdc; - - hdc = GetDC((HWND)parentWnd); - - x -= mousexoffset; - y -= mouseyoffset; - - MoveDragCardTo(hdc, x, y); - - //BitBlt(hdc, nDragCardWidth+10, 0, nDragCardWidth, nDragCardHeight, hdcBackGnd, 0, 0, SRCCOPY); - //BitBlt(hdc, 0, 0, nDragCardWidth, nDragCardHeight, hdcDragCard, 0, 0, SRCCOPY); - - ReleaseDC((HWND)parentWnd, hdc); - - oldx = x; - oldy = y; - - return true; -} - -// -// There is a bug in BitBlt when the source x,y -// become < 0. So this wrapper function simply adjusts -// the coords so that we never try to blt in from this range -// -BOOL ClippedBitBlt(HDC hdcDest, int x, int y, int width, int height, HDC hdcSrc, int srcx, int srcy, DWORD dwROP) -{ - if(srcx < 0) - { - x = 0 - srcx; - width = width + srcx; - srcx = 0; - } - - if(srcy < 0) - { - y = 0 - srcy; - height = height + srcy; - srcy = 0; - } - - return BitBlt(hdcDest, x, y, width, height, hdcSrc, srcx, srcy, dwROP); -} - -void CardRegion::MoveDragCardTo(HDC hdc, int x, int y) -{ - RECT inter, rect1, rect2; - - //mask off the new position of the drag-card, so - //that it will not be painted over - ClipCard(hdc, x, y, nDragCardWidth, nDragCardHeight); - - //restore the area covered by the card at its previous position - BitBlt(hdc, oldx, oldy, nDragCardWidth, nDragCardHeight, hdcBackGnd, 0, 0, SRCCOPY); - - //remove clipping so we can draw the card at its new place - SelectClipRgn(hdc, NULL); - - //if the card's old and new positions overlap, then we - //need some funky code to update the "saved background" image, - SetRect(&rect1, oldx, oldy, oldx+nDragCardWidth, oldy+nDragCardHeight); - SetRect(&rect2, x, y, x+nDragCardWidth, y+nDragCardHeight); - - if(IntersectRect(&inter, &rect1, &rect2)) - { - int interwidth = inter.right-inter.left; - int interheight = inter.bottom-inter.top; - int destx, desty, srcx, srcy; - - if(rect2.left > rect1.left) - { - destx = 0; srcx = nDragCardWidth - interwidth; - } - else - { - destx = nDragCardWidth - interwidth; srcx = 0; - } - - if(rect2.top > rect1.top) - { - desty = 0; srcy = nDragCardHeight - interheight; - } - else - { - desty = nDragCardHeight - interheight; srcy = 0; - } - - //shift the bit we didn't use for the restore (due to the clipping) - //into the opposite corner - BitBlt(hdcBackGnd, destx,desty, interwidth, interheight, hdcBackGnd, srcx, srcy, SRCCOPY); - - ExcludeClipRect(hdcBackGnd, destx, desty, destx+interwidth, desty+interheight); - - //this bit requires us to clip the BitBlt (from screen to background) - //as BitBlt is a bit buggy it seems - ClippedBitBlt(hdcBackGnd, 0,0, nDragCardWidth, nDragCardHeight, hdc, x, y, SRCCOPY); - SelectClipRgn(hdcBackGnd, NULL); - } - else - { - BitBlt(hdcBackGnd, 0,0, nDragCardWidth, nDragCardHeight, hdc, x, y, SRCCOPY); - } - - //finally draw the card to the screen - DrawCard(hdc, x, y, hdcDragCard, nDragCardWidth, nDragCardHeight); -} - - -//extern "C" int _fltused(void) { return 0; } -//extern "C" int _ftol(void) { return 0; } - -// -// Better do this in fixed-point, to stop -// VC from linking in floatingpoint-long conversions -// -//#define FIXED_PREC_MOVE -#ifdef FIXED_PREC_MOVE -#define PRECISION 12 -void ZoomCard(HDC hdc, int xpos, int ypos, CARDSTACK *dest) -{ - long dx, dy, x , y; - - - int apparentcards; - x = xpos << PRECISION; y = ypos << PRECISION; - - oldx = (int)xpos; - oldy = (int)ypos; - - apparentcards=dest->numcards/dest->threedcount; - - int idestx = dest->xpos + dest->xoffset * (apparentcards);// - iNumDragCards); - int idesty = dest->ypos + dest->yoffset * (apparentcards);// - iNumDragCards); - - //normalise the motion vector - dx = (idestx<<PRECISION) - x; - dy = (idesty<<PRECISION) - y; - long recip = (1 << PRECISION) / 1;//sqrt(dx*dx + dy*dy); - - dx *= recip * 16;//CARDZOOMSPEED; - dy *= recip * 16;//CARDZOOMSPEED; - [truncated at 1000 lines; 119 more skipped]

19 years, 9 months

[sedwards] 13904: imported catch-22 sol clone with authors permission

by sedwards＠svn.reactos.com

imported catch-22 sol clone with authors permission Added: trunk/rosapps/games/solitaire/ Added: trunk/rosapps/games/solitaire/ReadMe.txt Added: trunk/rosapps/games/solitaire/cardlib/ Added: trunk/rosapps/games/solitaire/cardlib/card.h Added: trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak Added: trunk/rosapps/games/solitaire/cardlib/cardbutton.h Added: trunk/rosapps/games/solitaire/cardlib/cardcolor.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardcolor.h Added: trunk/rosapps/games/solitaire/cardlib/cardcount.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardcount.h Added: trunk/rosapps/games/solitaire/cardlib/cardlib.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardlib.h Added: trunk/rosapps/games/solitaire/cardlib/cardregion.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardregion.h Added: trunk/rosapps/games/solitaire/cardlib/cardrgndraw.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardrgnmouse.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardrgnmouse.cpp.bak Added: trunk/rosapps/games/solitaire/cardlib/cardstack.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardstack.h Added: trunk/rosapps/games/solitaire/cardlib/cardwindow.cpp Added: trunk/rosapps/games/solitaire/cardlib/cardwindow.h Added: trunk/rosapps/games/solitaire/cardlib/dropzone.cpp Added: trunk/rosapps/games/solitaire/cardlib/dropzone.h Added: trunk/rosapps/games/solitaire/cardlib/globals.h Added: trunk/rosapps/games/solitaire/icon1.ico Added: trunk/rosapps/games/solitaire/makefile Added: trunk/rosapps/games/solitaire/resource.h Added: trunk/rosapps/games/solitaire/sol.rc Added: trunk/rosapps/games/solitaire/solcreate.cpp Added: trunk/rosapps/games/solitaire/solgame.cpp Added: trunk/rosapps/games/solitaire/solitaire.cpp Added: trunk/rosapps/games/solitaire/solitaire.h _____ Added: trunk/rosapps/games/solitaire/ReadMe.txt --- trunk/rosapps/games/solitaire/ReadMe.txt 2005-03-10 03:50:43 UTC (rev 13903) +++ trunk/rosapps/games/solitaire/ReadMe.txt 2005-03-10 04:04:27 UTC (rev 13904) @@ -0,0 +1,22 @@ +Solitaire for ReactOS + +/***************************************** +A complete working example of the CardLib +card-game library. + +Freeware +Copyright J Brown 2001 + +Updates at http://www.catch22.net + +******************************************/ + +The author has given permission to use these sources +under Public Domain. Do what thou will but please give +credit where credit is due. + +If you wish to use cardlib to write another card game +for ReactOS please make cardlib a static lib. + +-sedwards + _____ Added: trunk/rosapps/games/solitaire/cardlib/card.h --- trunk/rosapps/games/solitaire/cardlib/card.h 2005-03-10 03:50:43 UTC (rev 13903) +++ trunk/rosapps/games/solitaire/cardlib/card.h 2005-03-10 04:04:27 UTC (rev 13904) @@ -0,0 +1,105 @@ +// +// CardLib - Card class +// +// Freeware +// Copyright J Brown 2001 +// + +#ifndef _CARD_INCLUDED +#define _CARD_INCLUDED + +enum eSuit { Clubs = 0, Diamonds = 1, Hearts = 2, Spades = 3 }; +enum eValue { Ace = 1, Two = 2, Three = 3, Four = 4, Five = 5, Six = 6, Seven = 7, + Eight = 8, Nine = 9, Ten = 10, Jack = 11, Queen = 12, King = 13 }; + +inline int MAKE_CARD(int Value, int Suit) +{ + if(Value < 1) Value = 1; + if(Value == 14) Value = 1; + if(Value > 13) Value = 13; + + if(Suit < 0) Suit = 0; + if(Suit > 3) Suit = 3; + + return ((Value - 1) * 4 + Suit); +} + +class Card +{ + friend class CardStack; + +public: + + Card() + { + nValue = 0; //ace of spades by default + fFaceUp = true; + } + + Card(int value, int suit) //specify a face value [1-13] and suit [0-3] + { + nValue = MAKE_CARD(value, suit); + fFaceUp = true; + } + + Card(int index) //specify a 0-51 index + { + if(index < 0) index = 0; + if(index > 51) index = 51; + + nValue = index; + fFaceUp = true; + } + + int Suit() const + { + return (nValue % 4); + } + + int LoVal() const + { + return (nValue / 4) + 1; + } + + int HiVal() const + { + return ((nValue < 4) ? 14 : (nValue / 4) + 1); + } + + int Idx() const //unique value (0-51 etc) + { + return nValue; + } + + bool FaceUp() const + { + return fFaceUp; + } + + bool FaceDown() const + { + return !fFaceUp; + } + + void SetFaceUp(bool fTrue) + { + fFaceUp = fTrue; + } + + bool IsBlack() const + { + return Suit() == 0 || Suit() == 3; + } + + bool IsRed() const + { + return !IsBlack(); + } + +private: + + int nValue; + bool fFaceUp; +}; + +#endif _____ Added: trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp --- trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp 2005-03-10 03:50:43 UTC (rev 13903) +++ trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp 2005-03-10 04:04:27 UTC (rev 13904) @@ -0,0 +1,281 @@ +// +// CardLib - Card bitmap support +// +// Freeware +// Copyright J Brown 2001 +// +#include <windows.h> +#include "globals.h" +#include "cardcolor.h" + +#ifndef __REACTOS__ +#pragma comment( lib, "..\\CardLib\\cards16.lib" ) + +extern "C" HINSTANCE WINAPI LoadLibrary16( PSTR ); +extern "C" void WINAPI FreeLibrary16( HINSTANCE ); +#endif + +#define NUMCARDBITMAPS (52+16) + +void PaintRect(HDC hdc, RECT *rect, COLORREF col); + +void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight) +{ + HBITMAP hBitmap; + HDC hdcCard; + HANDLE hOld; + int i, xpos; + int width, height; + BITMAP bmp; + + for(i = 0; i < NUMCARDBITMAPS; i++) + { + //convert into the range used by the cdt_xxx functions + int val; + + if(i < 52) val = (i % 4) * 13 + (i/4); + else val = i; + + hBitmap = LoadBitmap(hCardDll, MAKEINTRESOURCE(val + 1)); + GetObject(hBitmap, sizeof(bmp), &bmp); + + width = bmp.bmWidth; + height = bmp.bmHeight; + + if(i == 0) //if first time through, create BIG bitmap.. + { + HDC hdc = GetDC(0); + __hdcCardBitmaps = CreateCompatibleDC(hdc); + __hbmCardBitmaps = CreateCompatibleBitmap(hdc, width * NUMCARDBITMAPS, height); + SelectObject(__hdcCardBitmaps, __hbmCardBitmaps); + + hdcCard = CreateCompatibleDC(0); + + ReleaseDC(0, hdc); + } + + hOld = SelectObject(hdcCard, hBitmap); + BitBlt(__hdcCardBitmaps, i*width, 0, width, height, hdcCard, 0, 0, SRCCOPY); + SelectObject(hdcCard, hOld); + + //Now draw a black border around each card... + xpos = i*width; + MoveToEx(__hdcCardBitmaps, xpos+2, 0, 0); + LineTo(__hdcCardBitmaps, xpos+width - 3, 0); + LineTo(__hdcCardBitmaps, xpos+width - 1, 2); + LineTo(__hdcCardBitmaps, xpos+width - 1, height - 3); //vertical + LineTo(__hdcCardBitmaps, xpos+width - 3, height - 1); + LineTo(__hdcCardBitmaps, xpos+2, height - 1); + LineTo(__hdcCardBitmaps, xpos+0, height - 3); + LineTo(__hdcCardBitmaps, xpos+0, 2); + LineTo(__hdcCardBitmaps, xpos+2, 0); + + DeleteObject(hBitmap); + } + + DeleteDC(hdcCard); + + *pwidth = width; + *pheight = height; + +} + +void LoadCardBitmaps(void) +{ + HINSTANCE hCardDll; + + + //If Windows NT/2000/XP + if(GetVersion() < 0x80000000) + { + hCardDll = LoadLibrary("cards.dll"); + + if(hCardDll == 0) + { + MessageBox(0, "Error loading cards.dll (32bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); + PostQuitMessage(0); + return; + } + + LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); + + FreeLibrary(hCardDll); + } +#ifndef __REACTOS__ + //Else, Win9X + else + { + hCardDll = LoadLibrary16("cards.dll"); + + if(hCardDll == 0) + { + MessageBox(0, "Error loading cards.dll (16bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); + PostQuitMessage(0); + return; + } + + LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); + + FreeLibrary16(hCardDll); + } +#endif +} + +void FreeCardBitmaps() +{ + DeleteObject (__hbmCardBitmaps); + DeleteDC (__hdcCardBitmaps); +} +// +// Paint a checkered rectangle, with each alternate +// pixel being assigned a different colour +// +static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg) +{ + static WORD wCheckPat[8] = + { + 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 + }; + + HBITMAP hbmp; + HBRUSH hbr, hbrold; + COLORREF fgold, bgold; + + hbmp = CreateBitmap(8, 8, 1, 1, wCheckPat); + hbr = CreatePatternBrush(hbmp); + + //UnrealizeObject(hbr); + + SetBrushOrgEx(hdc, rect->left, rect->top, 0); + + hbrold = (HBRUSH)SelectObject(hdc, hbr); + + fgold = SetTextColor(hdc, fg); + bgold = SetBkColor(hdc, bg); + + PatBlt(hdc, rect->left, rect->top, + rect->right - rect->left, + rect->bottom - rect->top, + PATCOPY); + + SetBkColor(hdc, bgold); + SetTextColor(hdc, fgold); + + SelectObject(hdc, hbrold); + DeleteObject(hbr); + DeleteObject(hbmp); +} + +void GetSinkCols(COLORREF crBase, COLORREF *fg, COLORREF *bg, COLORREF *sh1, COLORREF *sh2) +{ + if(bg) *bg = crBase; + if(fg) *fg = ColorScaleRGB(crBase, RGB(255,255,255), 0.2);//RGB(49, 99, 140); + if(sh1) *sh1 = ColorScaleRGB(crBase, RGB(0,0,0), 0.4); + if(sh2) *sh2 = ColorScaleRGB(crBase, RGB(0,0,0), 0.2); +} + +HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, COLORREF col, int width, int height) +{ + HANDLE hold, hpold; + HBITMAP hbm = CreateCompatibleBitmap(hdcCompat, width, height); + + HPEN hpfg, hpbg, hpsh, hpsh2; + + RECT rect; + COLORREF fg, bg, shadow, shadow2; + + GetSinkCols(col, &fg, &bg, &shadow, &shadow2); + + hold = SelectObject(hdc, hbm); + + //fill with a solid base colour + SetRect(&rect, 0,0,width,height); + PaintRect(hdc, &rect, MAKE_PALETTERGB(bg)); + + //draw the outline + hpfg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(fg)); + hpbg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(bg)); + hpsh = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow)); + hpsh2= CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow2)); + + hpold = SelectObject(hdc, hpsh); + MoveToEx(hdc, 2, 0, NULL); + LineTo (hdc, width-3,0); + LineTo (hdc, width-1, 2); + + SelectObject(hdc, hpold); + hpold = SelectObject(hdc, hpsh2); + LineTo (hdc, width-1, height-3); //vertical + LineTo (hdc, width-3, height-1); + LineTo (hdc, 2, height-1); + LineTo (hdc, 0, height-3); + SelectObject(hdc, hpold); + hpold = SelectObject(hdc, hpsh); + + //MoveToEx( hdc, 0, height-3,0); + LineTo (hdc, 0, 2); + LineTo (hdc, 2, 0); + + SelectObject(hdc, hpold); + + //draw the highlight (vertical) + hpold = SelectObject(hdc, hpfg); + MoveToEx(hdc, width - 2, 3, NULL); + LineTo (hdc, width - 2, height - 2); + + //(horz) + MoveToEx(hdc, width - 3, height-2, NULL); + LineTo (hdc, 3, height-2); + SelectObject(hdc, hpold); + + //draw the background + InflateRect(&rect, -2, -2); + DrawCheckedRect(hdc, &rect, MAKE_PALETTERGB(bg), MAKE_PALETTERGB(fg)); + + //overwrite the top-left background pixel + SetPixel(hdc, 2, 2, MAKE_PALETTERGB(bg)); + + DeleteObject(hpsh); + DeleteObject(hpsh2); + DeleteObject(hpfg); + DeleteObject(hpbg); + + + return hbm; +} + + + +void CopyColor(PALETTEENTRY *pe, COLORREF col) +{ + pe->peBlue = GetBValue(col); + pe->peGreen = GetGValue(col); + pe->peRed = GetRValue(col); + pe->peFlags = 0; +} + +HPALETTE MakePaletteFromCols(COLORREF cols[], int nNumColours) +{ + LOGPALETTE *lp; + HPALETTE hPalette; + + // Allocate memory for the logical palette + lp = (LOGPALETTE *)HeapAlloc( + GetProcessHeap(), 0, sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * nNumColours); + + lp->palNumEntries = nNumColours; + lp->palVersion = 0x300; + + //copy the colours into the logical palette format + for(int i = 0; i < nNumColours; i++) + { + CopyColor(&lp->palPalEntry[i], cols[i]); + } + + // create palette! + hPalette = CreatePalette(lp); + + HeapFree(GetProcessHeap(), 0, lp); + + return hPalette; +} _____ Added: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp --- trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp 2005-03-10 03:50:43 UTC (rev 13903) +++ trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp 2005-03-10 04:04:27 UTC (rev 13904) @@ -0,0 +1,489 @@ +// +// CardLib - CardButton class +// +// Freeware +// Copyright J Brown 2001 +// +#include <windows.h> +#include <tchar.h> + +#include "cardlib.h" +#include "cardwindow.h" +#include "cardbutton.h" +#include "cardcolor.h" + +HPALETTE UseNicePalette(HDC, HPALETTE); +void RestorePalette(HDC, HPALETTE); + +void PaintRect(HDC hdc, RECT *rect, COLORREF colour); + +CardButton::CardButton(CardWindow &parent, int Id, TCHAR *szText, UINT Style, bool visible, + int x, int y, int width, int height) + + : parentWnd(parent), id(Id), fVisible(visible), uStyle(Style), ButtonCallback(0) +{ + crText = RGB(255,255,255); + crBack = RGB(0, 128, 0); + + xadjust = 0; + yadjust = 0; + xjustify = 0; + yjustify = 0; + + fMouseDown = false; + fButtonDown = false; + + hIcon = 0; + + SetText(szText); + Move(x, y, width, height); + + mxlock = CreateMutex(0, FALSE, 0); + + hFont = 0; +} + +CardButton::~CardButton() +{ + CloseHandle(mxlock); +} + +void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal) +{ + RECT fill; + + HANDLE hOld; + + HPEN hhi = CreatePen(0, 0, MAKE_PALETTERGB(crHighlight)); + HPEN hsh = CreatePen(0, 0, MAKE_PALETTERGB(crShadow)); + HPEN hbl = (HPEN)GetStockObject(BLACK_PEN); + + int x = rect->left; + int y = rect->top; + int width = rect->right-rect->left - 1; + int height = rect->bottom-rect->top - 1; + + SetRect(&fill, x+1, y+1, x+width-1, y+height-1); + + int one = 1; + + if(!fNormal) + { + x += width; + y += height; + width = -width; + height = -height; + one = -1; + OffsetRect(&fill, 1, 1); + } + + if(fNormal) + hOld = SelectObject(hdc, hhi); + else + hOld = SelectObject(hdc, hhi); + + MoveToEx(hdc, x, y+height, 0); + LineTo(hdc, x, y); + LineTo(hdc, x+width, y); + SelectObject(hdc, hOld); + + hOld = SelectObject(hdc, hbl); + LineTo(hdc, x+width, y+height); + LineTo(hdc, x-one, y+height); + SelectObject(hdc, hOld); + + hOld = SelectObject(hdc, hsh); + MoveToEx(hdc, x+one, y+height-one, 0); + LineTo(hdc, x+width-one, y+height-one); + LineTo(hdc, x+width-one, y); + SelectObject(hdc, hOld); + + PaintRect(hdc, &fill, MAKE_PALETTERGB(crBack)); + + DeleteObject(hhi); + DeleteObject(hsh); +} + +void CardButton::Clip(HDC hdc) +{ + if(fVisible == false) return; + + ExcludeClipRect(hdc, rect.left, rect.top, rect.right, rect.bottom); +} + +void CardButton::Draw(HDC hdc, bool fNormal) +{ + SIZE textsize; + int x, y; //text x, y + int ix, iy; //icon x, y + int iconwidth = 0; + + RECT cliprect; + + if(fVisible == 0) return; + + if(hFont == 0) + SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); + else + SelectObject(hdc, hFont); + + GetTextExtentPoint32(hdc, szText, lstrlen(szText), &textsize); + + if(hIcon) + { + x = rect.left + 32 + 8; + } + else + { + if(uStyle & CB_ALIGN_LEFT) + { + x = rect.left + iconwidth; + } + else if(uStyle & CB_ALIGN_RIGHT) + { + x = rect.left + (rect.right-rect.left-iconwidth-textsize.cx); + } + else //centered + { + x = rect.right - rect.left - iconwidth; + x = (x - textsize.cx) / 2; + x += rect.left + iconwidth; + } + } + + y = rect.bottom - rect.top; + y = (y - textsize.cy) / 2; + y += rect.top; + + //calc icon position.. + ix = rect.left + 4; + iy = rect.top + (rect.bottom-rect.top-32) / 2; + + //if button is pressed, then shift text + if(fNormal == false && (uStyle & CB_PUSHBUTTON)) + { + x += 1; + y += 1; + ix += 1; + iy += 1; + } + + SetRect(&cliprect, x, y, x+textsize.cx, y+textsize.cy); + ExcludeClipRect(hdc, x, y, x+textsize.cx, y+textsize.cy); + + // + // Calc icon pos + // + + if(hIcon) + { + ExcludeClipRect(hdc, ix, iy, ix + 32, iy + 32); + } + + if(uStyle & CB_PUSHBUTTON) + { + DrawRect(hdc, &rect, fNormal); + + SetBkColor(hdc, MAKE_PALETTERGB(crBack)); + SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); + + SelectClipRgn(hdc, 0); + + ExtTextOut(hdc, x, y, ETO_OPAQUE, &cliprect, szText, lstrlen(szText), 0); + } + else + { + SetBkColor(hdc, MAKE_PALETTERGB(crBack)); + SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); + + SelectClipRgn(hdc, 0); + + ExtTextOut(hdc, x, y, ETO_OPAQUE, &rect, szText, lstrlen(szText), 0); + } + + if(hIcon) + { + HBRUSH hbr = CreateSolidBrush(MAKE_PALETTERGB(crBack)); + DrawIconEx(hdc, ix, iy, hIcon, 32, 32, 0, hbr, 0); + DeleteObject(hbr); + } + +} + +void CardButton::AdjustPosition(int winwidth, int winheight) +{ + int width = rect.right-rect.left; + int height = rect.bottom-rect.top; + + width = width & ~0x1; + + switch(xjustify) + { + case CS_XJUST_NONE: + break; + + case CS_XJUST_CENTER: //centered + rect.left = (winwidth - (width)) / 2; + rect.left += xadjust; + rect.right = rect.left+width; + break; + + case CS_XJUST_RIGHT: //right-aligned + rect.left = winwidth - width; + rect.left += xadjust; + rect.right = rect.left+width; + break; + } + + switch(yjustify) + { + case CS_YJUST_NONE: + break; + + case CS_YJUST_CENTER: //centered + rect.top = (winheight - (height)) / 2; + rect.top += yadjust; + rect.bottom = rect.top+height; + break; + + case CS_YJUST_BOTTOM: //right-aligned + rect.top = winheight - height; + rect.top += yadjust; + rect.bottom = rect.top+height; + break; + } + +} + +int CardButton::OnLButtonDown(HWND hwnd, int x, int y) +{ + if((uStyle & CB_PUSHBUTTON) == 0) + return 0; + + //make sure that the user is allowed to do something + if(WaitForSingleObject(mxlock, 0) != WAIT_OBJECT_0) + { + return 0; + } + else + { + ReleaseMutex(mxlock); + } + + fMouseDown = true; + fButtonDown = true; + + Redraw(); + + SetCapture(hwnd); + + return 1; +} + +int CardButton::OnMouseMove(HWND hwnd, int x, int y) +{ + if(fMouseDown) + { + bool fOldButtonDown = fButtonDown; + + POINT pt; + + pt.x = x; + pt.y = y; + + if(PtInRect(&rect, pt)) + fButtonDown = true; + else + fButtonDown = false; + + if(fButtonDown != fOldButtonDown) + Redraw(); + } + + return 0; +} + +int CardButton::OnLButtonUp(HWND hwnd, int x, int y) +{ + if(fMouseDown) + { + fMouseDown = false; + fButtonDown = false; + + if(uStyle & CB_PUSHBUTTON) + { + Redraw(); + ReleaseCapture(); + } + + //if have clicked the button + if(parentWnd.CardButtonFromPoint(x, y) == this) + { + if(ButtonCallback) + { + ButtonCallback(*this); + } + else + { + HWND hwnd = (HWND)parentWnd; + SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd); + } + } + } + + return 0; +} + +#define _countof(array) (sizeof(array)/sizeof(array[0])) + +CardButton *CardWindow::CreateButton(int id, TCHAR *szText, UINT uStyle, bool fVisible, int x, int y, int width, int height) +{ + CardButton *cb; + + if(nNumButtons == MAXBUTTONS) + return 0; + + cb = new CardButton(*this, id, szText, uStyle, fVisible, x, y, width, height); + Buttons[nNumButtons++] = cb; + + if(uStyle & CB_PUSHBUTTON) + { + cb->SetBackColor(CardButton::GetFace(crBackgnd)); + //cb->SetBackColor(ScaleLumRGB(crBackgnd, 0.1)); + cb->SetForeColor(RGB(255,255,255)); + } + else + { + cb->SetBackColor(crBackgnd); + cb->SetForeColor(RGB(255,255,255)); + } + + return cb; +} + +void CardButton::SetText(TCHAR *lpszFormat, ...) +{ + int count; + + va_list args; + va_start(args, lpszFormat); + + count = wvsprintf(szText, lpszFormat, args); + va_end(args); +} + +int CardButton::Id() +{ + return id; +} + +void CardButton::Show(bool fShow) +{ + fVisible = fShow; +} + +void CardButton::Move(int x, int y, int width, int height) +{ + SetRect(&rect, x, y, x+width, y+height); +} + +void CardButton::Redraw() +{ + HDC hdc = GetDC((HWND)parentWnd); + + HPALETTE hOldPal = UseNicePalette(hdc, __hPalette); + + Draw(hdc, !fButtonDown); + + RestorePalette(hdc, hOldPal); + + ReleaseDC((HWND)parentWnd, hdc); +} + +void CardButton::SetForeColor(COLORREF cr) +{ + crText = cr; +} + +void CardButton::SetBackColor(COLORREF cr) +{ + crBack = cr; + + crHighlight = GetHighlight(cr); + crShadow = GetShadow(cr); + + //crHighlight = ScaleLumRGB(cr, +0.25); + //crShadow = ScaleLumRGB(cr, -0.25); +} + +// Static member +COLORREF CardButton::GetHighlight(COLORREF crBase) +{ + return ColorScaleRGB(crBase, RGB(255,255,255), 0.25); +} + +// Static member +COLORREF CardButton::GetShadow(COLORREF crBase) +{ + return ColorScaleRGB(crBase, RGB(0, 0, 0), 0.25); +} + +COLORREF CardButton::GetFace(COLORREF crBase) +{ + return ColorScaleRGB(crBase, RGB(255,255,255), 0.1); +} + +void CardButton::SetPlacement(UINT xJustify, UINT yJustify, int xAdjust, int yAdjust) +{ + xadjust = xAdjust; + yadjust = yAdjust; + xjustify = xJustify; + yjustify = yJustify; +} + +void CardButton::SetIcon(HICON hicon, bool fRedraw) +{ + hIcon = hicon; + + if(fRedraw) + Redraw(); +} + +void CardButton::SetFont(HFONT font) +{ + //don't delete the existing font.. + hFont = font; +} + +void CardButton::SetButtonProc(pButtonProc proc) +{ + ButtonCallback = proc; +} + +bool CardButton::Lock() +{ + DWORD dw = WaitForSingleObject(mxlock, 0); + + if(dw == WAIT_OBJECT_0) + return true; + else + return false; +} + +bool CardButton::UnLock() +{ + if(ReleaseMutex(mxlock)) + return true; + else + return false; +} + +void CardButton::SetStyle(UINT style) +{ + uStyle = style; +} + +UINT CardButton::GetStyle() +{ + return uStyle; +} _____ Added: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak --- trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak 2005-03-10 03:50:43 UTC (rev 13903) +++ trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp.bak 2005-03-10 04:04:27 UTC (rev 13904) @@ -0,0 +1,489 @@ +// +// CardLib - CardButton class +// +// Freeware +// Copyright J Brown 2001 +// +#include <windows.h> +#include <tchar.h> + +#include "cardlib.h" +#include "cardwindow.h" +#include "cardbutton.h" +#include "cardcolor.h" + +HPALETTE UseNicePalette(HDC, HPALETTE); +void RestorePalette(HDC, HPALETTE); + +void PaintRect(HDC hdc, RECT *rect, COLORREF colour); + +CardButton::CardButton(CardWindow &parent, int Id, TCHAR *szText, UINT Style, bool visible, + int x, int y, int width, int height) + + : parentWnd(parent), id(Id), fVisible(visible), uStyle(Style), ButtonCallback(0) +{ + crText = RGB(255,255,255); + crBack = RGB(0, 128, 0); + + xadjust = 0; + yadjust = 0; + xjustify = 0; + yjustify = 0; + + fMouseDown = false; + fButtonDown = false; + + hIcon = 0; + + SetText(szText); + Move(x, y, width, height); + + mxlock = CreateMutex(0, FALSE, 0); + + hFont = 0; +} + +CardButton::~CardButton() +{ + CloseHandle(mxlock); +} + +void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal) +{ + RECT fill; + + HANDLE hOld; + + HPEN hhi = CreatePen(0, 0, MAKE_PALETTERGB(crHighlight)); + HPEN hsh = CreatePen(0, 0, MAKE_PALETTERGB(crShadow)); + HPEN hbl = (HPEN)GetStockObject(BLACK_PEN); + + int x = rect->left; + int y = rect->top; + int width = rect->right-rect->left - 1; + int height = rect->bottom-rect->top - 1; + + SetRect(&fill, x+1, y+1, x+width-1, y+height-1); + + int one = 1; + + if(!fNormal) + { + x += width; + y += height; + width = -width; + height = -height; + one = -1; + OffsetRect(&fill, 1, 1); + } [truncated at 1000 lines; 6293 more skipped]

19 years, 9 months

[sedwards] 13903: added winres.h from Wine

by sedwards＠svn.reactos.com

added winres.h from Wine Added: trunk/reactos/w32api/include/winres.h _____ Added: trunk/reactos/w32api/include/winres.h --- trunk/reactos/w32api/include/winres.h 2005-03-09 23:38:37 UTC (rev 13902) +++ trunk/reactos/w32api/include/winres.h 2005-03-10 03:50:43 UTC (rev 13903) @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2000 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <winresrc.h> + +#ifdef IDC_STATIC +#undef IDC_STATIC +#endif +#define IDC_STATIC (-1) +

19 years, 9 months

[royce] 13902: don't try to create ROS_INTERMEDIATE directories if ROS_INTERMEDIATE isn't defined

by royce＠svn.reactos.com

don't try to create ROS_INTERMEDIATE directories if ROS_INTERMEDIATE isn't defined Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-09 22:29:18 UTC (rev 13901) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-09 23:38:37 UTC (rev 13902) @@ -288,6 +288,8 @@ set_string::iterator it; size_t wrap_count = 0; + + fprintf ( fMakefile, "ifneq ($(ROS_INTERMEDIATE),)\n" ); fprintf ( fMakefile, "directories::" ); for ( it = directory_set.begin (); @@ -322,7 +324,8 @@ } fprintf ( fMakefile, - "::\n\t${mkdir} $@\n\n" ); + "::\n\t${mkdir} $@\n" ); + fprintf ( fMakefile, "endif\n\n" ); directory_set.clear (); }

19 years, 9 months

[royce] 13901: simplified <if> handling ( and fixed several bugs, too )

by royce＠svn.reactos.com

simplified <if> handling ( and fixed several bugs, too ) cleaned up devcpp backend to compile with these changes Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-03-09 22:29:18 UTC (rev 13901) @@ -281,8 +281,9 @@ void AutomaticDependency::ProcessModule ( Module& module ) { - for ( size_t i = 0; i < module.files.size (); i++ ) - ProcessFile ( module, *module.files[i] ); + const vector<File*>& files = module.non_if_data.files; + for ( size_t i = 0; i < files.size (); i++ ) + ProcessFile ( module, *files[i] ); } void @@ -330,37 +331,30 @@ bool includeNext, string& resolvedFilename ) { - size_t i; - for ( i = 0; i < module.includes.size (); i++ ) + size_t i, j; + const vector<Include*>* pincludes; + for ( i = 0; i < 2; i++ ) { - Include* include = module.includes[i]; - if ( LocateIncludedFile ( include->directory, - includedFilename, - resolvedFilename ) ) + if ( !i ) + pincludes = &module.non_if_data.includes; + else + pincludes = &module.project.non_if_data.includes; + const vector<Include*>& includes = *pincludes; + for ( j = 0; j < includes.size (); j++ ) { - if ( includeNext && stricmp ( resolvedFilename.c_str (), - sourceFile->filename.c_str () ) == 0 ) - continue; - return true; + Include& include = *includes[j]; + if ( LocateIncludedFile ( include.directory, + includedFilename, + resolvedFilename ) ) + { + if ( includeNext && stricmp ( resolvedFilename.c_str (), + sourceFile->filename.c_str () ) == 0 ) + continue; + return true; + } } } - /* FIXME: Ifs */ - - for ( i = 0; i < module.project.includes.size (); i++ ) - { - Include* include = module.project.includes[i]; - if ( LocateIncludedFile ( include->directory, - includedFilename, - resolvedFilename ) ) - { - if ( includeNext && stricmp ( resolvedFilename.c_str (), - sourceFile->filename.c_str () ) == 0 ) - continue; - return true; - } - } - resolvedFilename = ""; return false; } @@ -398,10 +392,11 @@ struct utimbuf timebuf; for ( size_t mi = 0; mi < project.modules.size (); mi++ ) { - Module& module = *project.modules[mi]; - for ( size_t fi = 0; fi < module.files.size (); fi++ ) + const vector<File*>& files = project.modules[mi]->non_if_data.files; + //Module& module = *project.modules[mi]; + for ( size_t fi = 0; fi < files.size (); fi++ ) { - File& file = *module.files[fi]; + File& file = *files[fi]; string normalizedFilename = NormalizeFilename ( file.name ); SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-03-09 22:29:18 UTC (rev 13901) @@ -16,6 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER #include <iostream> #include <fstream> @@ -122,9 +126,9 @@ { Module &module = *ProjectNode.modules[i]; - for(size_t k = 0; k < module.files.size(); k++) + for(size_t k = 0; k < module.non_if_data.files.size(); k++) { - File &file = *module.files[k]; + File &file = *module.non_if_data.files[k]; ProcessFile(file.name); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-09 22:29:18 UTC (rev 13901) @@ -67,8 +67,7 @@ void MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation, - const vector<Include*>& includes, - const vector<Define*>& defines ) const + IfableData& data ) const { size_t i; @@ -76,17 +75,17 @@ fMakefile, "PROJECT_CFLAGS %s", assignmentOperation ); - for ( i = 0; i < includes.size(); i++ ) + for ( i = 0; i < data.includes.size(); i++ ) { fprintf ( fMakefile, " -I%s", - includes[i]->directory.c_str() ); + data.includes[i]->directory.c_str() ); } - for ( i = 0; i < defines.size(); i++ ) + for ( i = 0; i < data.defines.size(); i++ ) { - Define& d = *defines[i]; + Define& d = *data.defines[i]; fprintf ( fMakefile, " -D%s", @@ -103,32 +102,30 @@ void MingwBackend::GenerateGlobalCFlagsAndProperties ( const char* assignmentOperation, - const vector<Property*>& properties, - const vector<Include*>& includes, - const vector<Define*>& defines, - const vector<If*>& ifs ) const + IfableData& data ) const { size_t i; - for ( i = 0; i < properties.size(); i++ ) + for ( i = 0; i < data.properties.size(); i++ ) { - Property& prop = *properties[i]; + Property& prop = *data.properties[i]; fprintf ( fMakefile, "%s := %s\n", prop.name.c_str(), prop.value.c_str() ); } - if ( includes.size() || defines.size() ) + if ( data.includes.size() || data.defines.size() ) { GenerateProjectCFlagsMacro ( assignmentOperation, - includes, - defines ); + data ); } - for ( i = 0; i < ifs.size(); i++ ) + for ( i = 0; i < data.ifs.size(); i++ ) { - If& rIf = *ifs[i]; - if ( rIf.defines.size() || rIf.includes.size() || rIf.ifs.size() ) + If& rIf = *data.ifs[i]; + if ( rIf.data.defines.size() + || rIf.data.includes.size() + || rIf.data.ifs.size() ) { fprintf ( fMakefile, @@ -137,10 +134,7 @@ rIf.value.c_str() ); GenerateGlobalCFlagsAndProperties ( "+=", - rIf.properties, - rIf.includes, - rIf.defines, - rIf.ifs ); + rIf.data ); fprintf ( fMakefile, "endif\n\n" ); @@ -175,10 +169,7 @@ fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=", - ProjectNode.properties, - ProjectNode.includes, - ProjectNode.defines, - ProjectNode.ifs ); + ProjectNode.non_if_data ); fprintf ( fMakefile, "PROJECT_RCFLAGS = $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS = %s\n", GenerateProjectLFLAGS ().c_str () ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-09 22:29:18 UTC (rev 13901) @@ -16,13 +16,9 @@ void CloseMakefile () const; void GenerateHeader () const; void GenerateProjectCFlagsMacro ( const char* assignmentOperation, - const std::vector<Include*>& includes, - const std::vector<Define*>& defines ) const; + IfableData& data ) const; void GenerateGlobalCFlagsAndProperties ( const char* op, - const std::vector<Property*>& properties, - const std::vector<Include*>& includes, - const std::vector<Define*>& defines, - const std::vector<If*>& ifs ) const; + IfableData& data ) const; std::string GenerateProjectLFLAGS () const; void GenerateDirectoryTargets () const; void GenerateGlobalVariables () const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-09 22:29:18 UTC (rev 13901) @@ -179,22 +179,29 @@ size_t i; string sourceFilenames ( "" ); - for ( i = 0; i < module.files.size (); i++ ) + const vector<File*>& files = module.non_if_data.files; + for ( i = 0; i < files.size (); i++ ) { - if ( includeGeneratedFiles || !IsGeneratedFile ( *module.files[i] ) ) - sourceFilenames += " " + GetActualSourceFilename ( module.files[i]->name ); + if ( includeGeneratedFiles || !IsGeneratedFile ( *files[i] ) ) + sourceFilenames += " " + GetActualSourceFilename ( files[i]->name ); } - vector<If*> ifs = module.ifs; - for ( i = 0; i < ifs.size (); i++ ) + // intentionally make a copy so that we can append more work in + // the middle of processing without having to go recursive + vector<If*> v = module.non_if_data.ifs; + for ( i = 0; i < v.size (); i++ ) { size_t j; - If& rIf = *ifs[i]; - for ( j = 0; j < rIf.ifs.size (); j++ ) - ifs.push_back ( rIf.ifs[j] ); - for ( j = 0; j < rIf.files.size (); j++ ) + If& rIf = *v[i]; + // check for sub-ifs to add to list + const vector<If*>& ifs = rIf.data.ifs; + for ( j = 0; j < ifs.size (); j++ ) + v.push_back ( ifs[j] ); + const vector<File*>& files = rIf.data.files; + for ( j = 0; j < files.size (); j++ ) { - if ( includeGeneratedFiles || !IsGeneratedFile ( *rIf.files[j] ) ) - sourceFilenames += " " + GetActualSourceFilename ( rIf.files[j]->name ); + File& file = *files[j]; + if ( includeGeneratedFiles || !IsGeneratedFile ( file ) ) + sourceFilenames += " " + GetActualSourceFilename ( file.name ); } } return sourceFilenames; @@ -250,15 +257,16 @@ string MingwModuleHandler::GetObjectFilenames ( const Module& module ) const { - if ( module.files.size () == 0 ) + const vector<File*>& files = module.non_if_data.files; + if ( files.size () == 0 ) return ""; string objectFilenames ( "" ); - for ( size_t i = 0; i < module.files.size (); i++ ) + for ( size_t i = 0; i < files.size (); i++ ) { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( module.files[i]->name ) ); + objectFilenames += PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ); } return objectFilenames; } @@ -342,8 +350,8 @@ string MingwModuleHandler::GenerateGccDefineParameters ( const Module& module ) const { - string parameters = GenerateGccDefineParametersFromVector ( module.project.defines ); - string s = GenerateGccDefineParametersFromVector ( module.defines ); + string parameters = GenerateGccDefineParametersFromVector ( module.project.non_if_data.defines ); + string s = GenerateGccDefineParametersFromVector ( module.non_if_data.defines ); if ( s.length () > 0 ) { parameters += " "; @@ -381,8 +389,8 @@ string MingwModuleHandler::GenerateGccIncludeParameters ( const Module& module ) const { - string parameters = GenerateGccIncludeParametersFromVector ( module.includes ); - string s = GenerateGccIncludeParametersFromVector ( module.project.includes ); + string parameters = GenerateGccIncludeParametersFromVector ( module.non_if_data.includes ); + string s = GenerateGccIncludeParametersFromVector ( module.project.non_if_data.includes ); if ( s.length () > 0 ) { parameters += " "; @@ -444,11 +452,11 @@ } void -MingwModuleHandler::GenerateMacro ( const char* assignmentOperation, - const string& macro, - const vector<Include*>& includes, - const vector<Define*>& defines, - const vector<CompilerFlag*>* compilerFlags ) const +MingwModuleHandler::GenerateMacro ( + const char* assignmentOperation, + const string& macro, + const IfableData& data, + const vector<CompilerFlag*>* compilerFlags ) const { size_t i; @@ -470,16 +478,16 @@ } } - for ( i = 0; i < includes.size(); i++ ) + for ( i = 0; i < data.includes.size(); i++ ) { fprintf ( fMakefile, " -I%s", - includes[i]->directory.c_str() ); + data.includes[i]->directory.c_str() ); } - for ( i = 0; i < defines.size(); i++ ) + for ( i = 0; i < data.defines.size(); i++ ) { - Define& d = *defines[i]; + Define& d = *data.defines[i]; fprintf ( fMakefile, " -D%s", @@ -496,13 +504,9 @@ void MingwModuleHandler::GenerateMacros ( const char* assignmentOperation, - const vector<File*>& files, - const vector<Include*>& includes, - const vector<Define*>& defines, - const vector<Library*>& libraries, + const IfableData& data, const vector<CompilerFlag*>* compilerFlags, const vector<LinkerFlag*>* linkerFlags, - const vector<If*>& ifs, const string& cflags_macro, const string& nasmflags_macro, const string& windresflags_macro, @@ -513,17 +517,15 @@ { size_t i; - if ( includes.size () > 0 || defines.size () > 0 ) + if ( data.includes.size () > 0 || data.defines.size () > 0 ) { GenerateMacro ( assignmentOperation, cflags_macro, - includes, - defines, + data, compilerFlags ); GenerateMacro ( assignmentOperation, windresflags_macro, - includes, - defines, + data, compilerFlags ); } @@ -541,9 +543,9 @@ } } - if ( libraries.size () > 0 ) + if ( data.libraries.size () > 0 ) { - string deps = GenerateImportLibraryDependenciesFromVector ( libraries ); + string deps = GenerateImportLibraryDependenciesFromVector ( data.libraries ); if ( deps.size () > 0 ) { fprintf ( @@ -555,16 +557,19 @@ } } + const vector<File*>& files = data.files; if ( files.size () > 0 ) { for ( i = 0; i < files.size (); i++ ) { - if ( files[i]->first ) + File& file = *files[i]; + if ( file.first ) { fprintf ( fMakefile, "%s := %s $(%s)\n", objs_macro.c_str(), - PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ).c_str (), + PassThruCacheDirectory ( + MingwModuleHandler::GetObjectFilename ( file.name ) ).c_str (), objs_macro.c_str() ); } } @@ -575,26 +580,29 @@ assignmentOperation ); for ( i = 0; i < files.size(); i++ ) { - if ( !files[i]->first ) + File& file = *files[i]; + if ( !file.first ) { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? "\\\n\t" : " " ), - PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ).c_str () ); + PassThruCacheDirectory ( + MingwModuleHandler::GetObjectFilename ( file.name ) ).c_str () ); } } fprintf ( fMakefile, "\n" ); } + const vector<If*>& ifs = data.ifs; for ( i = 0; i < ifs.size(); i++ ) { If& rIf = *ifs[i]; - if ( rIf.defines.size() - || rIf.includes.size() - || rIf.libraries.size() - || rIf.files.size() - || rIf.ifs.size() ) + if ( rIf.data.defines.size() + || rIf.data.includes.size() + || rIf.data.libraries.size() + || rIf.data.files.size() + || rIf.data.ifs.size() ) { fprintf ( fMakefile, @@ -603,13 +611,9 @@ rIf.value.c_str() ); GenerateMacros ( "+=", - rIf.files, - rIf.includes, - rIf.defines, - rIf.libraries, + rIf.data, NULL, NULL, - rIf.ifs, cflags_macro, nasmflags_macro, windresflags_macro, @@ -637,13 +641,9 @@ { GenerateMacros ( "=", - module.files, - module.includes, - module.defines, - module.libraries, + module.non_if_data, &module.compilerFlags, &module.linkerFlags, - module.ifs, cflags_macro, nasmflags_macro, windresflags_macro, @@ -655,9 +655,10 @@ if ( module.importLibrary ) { string s; - for ( size_t i = 0; i < module.files.size (); i++ ) + const vector<File*>& files = module.non_if_data.files; + for ( size_t i = 0; i < files.size (); i++ ) { - File& file = *module.files[i]; + File& file = *files[i]; string extension = GetExtension ( file.name ); if ( extension == ".spec" || extension == ".SPEC" ) { @@ -991,8 +992,7 @@ void MingwModuleHandler::GenerateObjectFileTargets ( const Module& module, - const vector<File*>& files, - const vector<If*>& ifs, + const IfableData& data, const string& cc, const string& cppc, const string& cflagsMacro, @@ -1002,6 +1002,7 @@ { size_t i; + const vector<File*>& files = data.files; for ( i = 0; i < files.size (); i++ ) { string sourceFilename = files[i]->name; @@ -1017,11 +1018,11 @@ "\n" ); } + const vector<If*>& ifs = data.ifs; for ( i = 0; i < ifs.size(); i++ ) { GenerateObjectFileTargets ( module, - ifs[i]->files, - ifs[i]->ifs, + ifs[i]->data, cc, cppc, cflagsMacro, @@ -1042,8 +1043,7 @@ string_list& clean_files ) const { GenerateObjectFileTargets ( module, - module.files, - module.ifs, + module.non_if_data, cc, cppc, cflagsMacro, @@ -1054,17 +1054,19 @@ } void -MingwModuleHandler::GetCleanTargets ( string_list& out, - const vector<File*>& files, - const vector<If*>& ifs ) const +MingwModuleHandler::GetCleanTargets ( + string_list& out, + const IfableData& data ) const { size_t i; + const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) out.push_back ( PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ) ); + const vector<If*>& ifs = data.ifs; for ( i = 0; i < ifs.size(); i++ ) - GetCleanTargets ( out, ifs[i]->files, ifs[i]->ifs ); + GetCleanTargets ( out, ifs[i]->data ); } string @@ -1405,9 +1407,10 @@ string dkNkmLibNoFixup = "dk/nkm/lib"; dependencies += FixupTargetFilename ( dkNkmLibNoFixup ); PassThruCacheDirectory ( dkNkmLibNoFixup + SSEP ); - for ( size_t i = 0; i < module.files.size (); i++ ) + const vector<File*>& files = module.non_if_data.files; + for ( size_t i = 0; i < files.size (); i++ ) { - File& file = *module.files[i]; + File& file = *files[i]; string extension = GetExtension ( file.name ); if ( extension == ".spec" || extension == ".SPEC" ) { @@ -1419,27 +1422,14 @@ return dependencies; } -/*string -MingwModuleHandler::GetLinkingDependencies ( const Module& module ) const -{ - string dependencies = GetImportLibraryDependencies ( module ); - string s = GetDefinitionDependencies ( module ); - if ( s.length () > 0 ) - { - dependencies += " "; - dependencies += s; - } - return dependencies; -}*/ - bool MingwModuleHandler::IsCPlusPlusModule ( const Module& module ) const { - if ( module.HasFileWithExtensions ( ".cc", ".CC" ) ) + if ( module.HasFileWithExtension ( module.non_if_data, ".cc" ) ) return true; - if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) ) + if ( module.HasFileWithExtension ( module.non_if_data, ".cxx" ) ) return true; - if ( module.HasFileWithExtensions ( ".cpp", ".CPP" ) ) + if ( module.HasFileWithExtension ( module.non_if_data, ".cpp" ) ) return true; return false; } @@ -1636,7 +1626,9 @@ } void -MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Module& module, string_list& clean_files ) +MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( + const Module& module, + string_list& clean_files ) { static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); @@ -1647,7 +1639,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - if ( module.files.size () > 0 ) + if ( module.non_if_data.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module, clean_files ); @@ -1706,7 +1698,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - if ( module.files.size () > 0 ) + if ( module.non_if_data.files.size () > 0 ) { string cflags ( "-D__NTDRIVER__" ); GenerateMacrosAndTargetsTarget ( module, @@ -1766,7 +1758,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - if ( module.files.size () > 0 ) + if ( module.non_if_data.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module, clean_files ); @@ -1822,7 +1814,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - if ( module.files.size () > 0 ) + if ( module.non_if_data.files.size () > 0 ) { string cflags ( "-D__NTAPP__" ); GenerateMacrosAndTargetsTarget ( module, @@ -1878,9 +1870,10 @@ module.name.c_str () ); fprintf ( fMakefile, "%s_extractresources: bin2res\n", module.name.c_str () ); - for ( size_t i = 0; i < module.files.size (); i++ ) + const vector<File*>& files = module.non_if_data.files; + for ( size_t i = 0; i < files.size (); i++ ) { - File& file = *module.files[i]; + File& file = *files[i]; string extension = GetExtension ( file.name ); if ( extension == ".rc" || extension == ".RC" ) { @@ -1905,7 +1898,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - if ( module.files.size () > 0 ) + if ( module.non_if_data.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module, clean_files ); @@ -1967,7 +1960,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - if ( module.files.size () > 0 ) + if ( module.non_if_data.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module, clean_files ); @@ -2029,7 +2022,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - if ( module.files.size () > 0 ) + if ( module.non_if_data.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module, clean_files ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-09 22:29:18 UTC (rev 13901) @@ -86,17 +86,12 @@ std::string GenerateLinkerParameters ( const Module& module ) const; void GenerateMacro ( const char* assignmentOperation, const std::string& macro, - const std::vector<Include*>& includes, - const std::vector<Define*>& defines, + const IfableData& data, const std::vector<CompilerFlag*>* compilerFlags ) const; void GenerateMacros ( const char* op, - const std::vector<File*>& files, - const std::vector<Include*>& includes, - const std::vector<Define*>& defines, - const std::vector<Library*>& libraries, + const IfableData& data, const std::vector<CompilerFlag*>* compilerFlags, const std::vector<LinkerFlag*>* linkerFlags, - const std::vector<If*>& ifs, const std::string& cflags_macro, const std::string& nasmflags_macro, const std::string& windresflags_macro, @@ -141,8 +136,7 @@ const std::string& windresflagsMacro, string_list& clean_files ) const; void GenerateObjectFileTargets ( const Module& module, - const std::vector<File*>& files, - const std::vector<If*>& ifs, + const IfableData& data, const std::string& cc, const std::string& cppc, const std::string& cflagsMacro, @@ -157,8 +151,7 @@ const std::string& windresflagsMacro, string_list& clean_files ) const; void GetCleanTargets ( string_list& out, - const std::vector<File*>& files, - const std::vector<If*>& ifs ) const; + const IfableData& data ) const; std::string GenerateArchiveTarget ( const Module& module, const std::string& ar, const std::string& objs_macro ) const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-09 22:29:18 UTC (rev 13901) @@ -50,6 +50,40 @@ return FixSeparator ( relativeNormalizedPath ); } +IfableData::~IfableData() +{ + size_t i; + for ( i = 0; i < files.size(); i++ ) + delete files[i]; + for ( i = 0; i < includes.size(); i++ ) + delete includes[i]; + for ( i = 0; i < defines.size(); i++ ) + delete defines[i]; + for ( i = 0; i < libraries.size(); i++ ) + delete libraries[i]; + for ( i = 0; i < properties.size(); i++ ) + delete properties[i]; + for ( i = 0; i < ifs.size(); i++ ) + delete ifs[i]; +} + +void IfableData::ProcessXML () +{ + size_t i; + for ( i = 0; i < files.size (); i++ ) + files[i]->ProcessXML (); + for ( i = 0; i < includes.size (); i++ ) + includes[i]->ProcessXML (); + for ( i = 0; i < defines.size (); i++ ) + defines[i]->ProcessXML (); + for ( i = 0; i < libraries.size (); i++ ) + libraries[i]->ProcessXML (); + for ( i = 0; i < properties.size(); i++ ) + properties[i]->ProcessXML (); + for ( i = 0; i < ifs.size (); i++ ) + ifs[i]->ProcessXML (); +} + Module::Module ( const Project& project, const XMLElement& moduleNode, const string& modulePath ) @@ -99,20 +133,10 @@ Module::~Module () { size_t i; - for ( i = 0; i < files.size(); i++ ) - delete files[i]; - for ( i = 0; i < libraries.size(); i++ ) - delete libraries[i]; - for ( i = 0; i < includes.size(); i++ ) - delete includes[i]; - for ( i = 0; i < defines.size(); i++ ) - delete defines[i]; for ( i = 0; i < invocations.size(); i++ ) delete invocations[i]; for ( i = 0; i < dependencies.size(); i++ ) delete dependencies[i]; - for ( i = 0; i < ifs.size(); i++ ) - delete ifs[i]; for ( i = 0; i < compilerFlags.size(); i++ ) delete compilerFlags[i]; for ( i = 0; i < linkerFlags.size(); i++ ) @@ -125,24 +149,15 @@ size_t i; for ( i = 0; i < node.subElements.size(); i++ ) ProcessXMLSubElement ( *node.subElements[i], path ); - for ( i = 0; i < files.size (); i++ ) - files[i]->ProcessXML (); - for ( i = 0; i < libraries.size(); i++ ) - libraries[i]->ProcessXML (); - for ( i = 0; i < includes.size(); i++ ) - includes[i]->ProcessXML (); - for ( i = 0; i < defines.size(); i++ ) - defines[i]->ProcessXML (); for ( i = 0; i < invocations.size(); i++ ) invocations[i]->ProcessXML (); for ( i = 0; i < dependencies.size(); i++ ) dependencies[i]->ProcessXML (); - for ( i = 0; i < ifs.size(); i++ ) - ifs[i]->ProcessXML(); for ( i = 0; i < compilerFlags.size(); i++ ) compilerFlags[i]->ProcessXML(); for ( i = 0; i < linkerFlags.size(); i++ ) linkerFlags[i]->ProcessXML(); + non_if_data.ProcessXML(); } void @@ -167,18 +182,18 @@ } File* pFile = new File ( FixSeparator ( path + CSEP + e.value ), first ); if ( pIf ) - pIf->files.push_back ( pFile ); + pIf->data.files.push_back ( pFile ); else - files.push_back ( pFile ); + non_if_data.files.push_back ( pFile ); subs_invalid = true; } else if ( e.name == "library" && e.value.size () ) { - /*if ( pIf ) - throw InvalidBuildFileException ( - e.location, - "<library> is not a valid sub-element of <if>" );*/ - libraries.push_back ( new Library ( e, *this, e.value ) ); + Library* pLibrary = new Library ( e, *this, e.value ); + if ( pIf ) + pIf->data.libraries.push_back ( pLibrary ); + else + non_if_data.libraries.push_back ( pLibrary ); subs_invalid = true; } else if ( e.name == "directory" ) @@ -191,18 +206,18 @@ { Include* include = new Include ( project, this, e ); if ( pIf ) - pIf->includes.push_back ( include ); + pIf->data.includes.push_back ( include ); else - includes.push_back ( include ); + non_if_data.includes.push_back ( include ); subs_invalid = true; } else if ( e.name == "define" ) { Define* pDefine = new Define ( project, this, e ); if ( pIf ) - pIf->defines.push_back ( pDefine ); + pIf->data.defines.push_back ( pDefine ); else - defines.push_back ( pDefine ); + non_if_data.defines.push_back ( pDefine ); subs_invalid = true; } else if ( e.name == "invoke" ) @@ -241,9 +256,9 @@ If* pOldIf = pIf; pIf = new If ( e, project, this ); if ( pOldIf ) - pOldIf->ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( pIf ); else - ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( pIf ); subs_invalid = false; } else if ( e.name == "compilerflag" ) @@ -483,16 +498,23 @@ } bool -Module::HasFileWithExtensions ( const std::string& extension1, - const std::string& extension2 ) const +Module::HasFileWithExtension ( + const IfableData& data, + const std::string& extension ) const { - for ( size_t i = 0; i < files.size (); i++ ) + size_t i; + for ( i = 0; i < data.files.size (); i++ ) { - File& file = *files[i]; - string extension = GetExtension ( file.name ); - if ( extension == extension1 || extension == extension2 ) + File& file = *data.files[i]; + string file_ext = GetExtension ( file.name ); + if ( !stricmp ( file_ext.c_str (), extension.c_str () ) ) return true; } + for ( i = 0; i < data.ifs.size (); i++ ) + { + if ( HasFileWithExtension ( data.ifs[i]->data, extension ) ) + return true; + } return false; } @@ -756,15 +778,6 @@ If::~If () { - size_t i; - for ( i = 0; i < files.size(); i++ ) - delete files[i]; - for ( i = 0; i < includes.size(); i++ ) - delete includes[i]; - for ( i = 0; i < defines.size(); i++ ) - delete defines[i]; - for ( i = 0; i < ifs.size(); i++ ) - delete ifs[i]; } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-09 22:20:41 UTC (rev 13900) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-09 22:29:18 UTC (rev 13901) @@ -20,16 +20,8 @@ size_t i; for ( i = 0; i < modules.size (); i++ ) delete modules[i]; - for ( i = 0; i < includes.size (); i++ ) - delete includes[i]; - for ( i = 0; i < defines.size (); i++ ) - delete defines[i]; for ( i = 0; i < linkerFlags.size (); i++ ) delete linkerFlags[i]; - for ( i = 0; i < properties.size (); i++ ) - delete properties[i]; - for ( i = 0; i < ifs.size (); i++ ) - delete ifs[i]; for ( i = 0; i < cdfiles.size (); i++ ) delete cdfiles[i]; delete head; @@ -38,9 +30,9 @@ const Property* Project::LookupProperty ( const string& name ) const { - for ( size_t i = 0; i < properties.size (); i++ ) + for ( size_t i = 0; i < non_if_data.properties.size (); i++ ) { - const Property* property = properties[i]; + const Property* property = non_if_data.properties[i]; if ( property->name == name ) return property; } @@ -222,18 +214,11 @@ ProcessXMLSubElement ( *node->subElements[i], path ); for ( i = 0; i < modules.size (); i++ ) modules[i]->ProcessXML (); - for ( i = 0; i < includes.size (); i++ ) - includes[i]->ProcessXML (); - for ( i = 0; i < defines.size (); i++ ) - defines[i]->ProcessXML (); for ( i = 0; i < linkerFlags.size (); i++ ) linkerFlags[i]->ProcessXML (); - for ( i = 0; i < properties.size(); i++ ) - properties[i]->ProcessXML (); - for ( i = 0; i < ifs.size (); i++ ) - ifs[i]->ProcessXML (); [truncated at 1000 lines; 139 more skipped]

19 years, 9 months

[gdalsnes] 13900: LockFileEx: forward overlapped->hEvent to NtLockFile

by gdalsnes＠svn.reactos.com

LockFileEx: forward overlapped->hEvent to NtLockFile LockFile: zero overlapped->hEvent Modified: trunk/reactos/lib/kernel32/file/lock.c _____ Modified: trunk/reactos/lib/kernel32/file/lock.c --- trunk/reactos/lib/kernel32/file/lock.c 2005-03-09 08:12:30 UTC (rev 13899) +++ trunk/reactos/lib/kernel32/file/lock.c 2005-03-09 22:20:41 UTC (rev 13900) @@ -39,6 +39,7 @@ Overlapped.Offset = dwFileOffsetLow; Overlapped.OffsetHigh = dwFileOffsetHigh; + Overlapped.hEvent = NULL; dwReserved = 0; return LockFileEx(hFile, LOCKFILE_FAIL_IMMEDIATELY|LOCKFILE_EXCLUSIVE_LOCK,dwReserved,nNumberOfBy tesToLockLow, nNumberOfBytesToLockHigh, &Overlapped ) ; @@ -57,7 +58,7 @@ DWORD dwReserved, DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh, - LPOVERLAPPED lpOverlapped + LPOVERLAPPED lpOverlapped /* required! */ ) { LARGE_INTEGER BytesToLock; @@ -66,7 +67,7 @@ NTSTATUS errCode; LARGE_INTEGER Offset; - if(dwReserved != 0) + if(dwReserved != 0 || lpOverlapped==NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -91,9 +92,9 @@ BytesToLock.u.HighPart = nNumberOfBytesToLockHigh; errCode = NtLockFile(hFile, + lpOverlapped->hEvent, NULL, NULL, - NULL, (PIO_STATUS_BLOCK)lpOverlapped, &Offset, &BytesToLock, @@ -124,13 +125,13 @@ DWORD nNumberOfBytesToUnlockHigh ) { - DWORD dwReserved; OVERLAPPED Overlapped; + DWORD dwReserved; Overlapped.Offset = dwFileOffsetLow; Overlapped.OffsetHigh = dwFileOffsetHigh; - dwReserved = 0; - return UnlockFileEx(hFile, dwReserved, nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh, &Overlapped); - + dwReserved = 0; + + return UnlockFileEx(hFile, dwReserved, nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh, &Overlapped); } @@ -144,23 +145,18 @@ DWORD dwReserved, DWORD nNumberOfBytesToUnLockLow, DWORD nNumberOfBytesToUnLockHigh, - LPOVERLAPPED lpOverlapped + LPOVERLAPPED lpOverlapped /* required! */ ) { LARGE_INTEGER BytesToUnLock; LARGE_INTEGER StartAddress; NTSTATUS errCode; - if(dwReserved != 0) + if(dwReserved != 0 || lpOverlapped == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if ( lpOverlapped == NULL ) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } BytesToUnLock.u.LowPart = nNumberOfBytesToUnLockLow; BytesToUnLock.u.HighPart = nNumberOfBytesToUnLockHigh;

19 years, 9 months

[royce] 13899: fixed some dependency issues, verbose support, 'make clean' gets more

by royce＠svn.reactos.com

fixed some dependency issues, verbose support, 'make clean' gets more Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile Modified: branches/xmlbuildsystem/reactos/tools/cdmake/makefile Modified: branches/xmlbuildsystem/reactos/tools/nci/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/unicode/makefile Modified: branches/xmlbuildsystem/reactos/tools/wmc/makefile Modified: branches/xmlbuildsystem/reactos/tools/wpp/Makefile Modified: branches/xmlbuildsystem/reactos/tools/wrc/makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-09 08:04:40 UTC (rev 13898) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-09 08:12:30 UTC (rev 13899) @@ -1,37 +1,52 @@ -host_gcc = gcc -host_gpp = g++ -host_ld = ld -host_ar = ar -host_objcopy = objcopy +# Default to half-verbose mode +ifeq ($(VERBOSE),no) + Q = @ + HALFVERBOSEECHO = @: +else +ifeq ($(VERBOSE),yes) + Q = + HALFVERBOSEECHO = @: +else + Q = @ + HALFVERBOSEECHO = @echo +endif +endif + + +host_gcc = $(Q)gcc +host_gpp = $(Q)g++ +host_ld = $(Q)ld +host_ar = $(Q)ar +host_objcopy = $(Q)objcopy ifeq ($(HOST),mingw32-linux) EXEPREFIX = ./ EXEPOSTFIX = SEP = / - nmkdir = mkdir -p - gcc = mingw32-gcc - gpp = mingw32-g++ - ld = mingw32-ld - ar = mingw32-ar - objcopy = mingw32-objcopy - dlltool = mingw32-dlltool - windres = mingw32-windres + nmkdir = $(Q)mkdir -p + gcc = $(Q)mingw32-gcc + gpp = $(Q)mingw32-g++ + ld = $(Q)mingw32-ld + ar = $(Q)mingw32-ar + objcopy = $(Q)mingw32-objcopy + dlltool = $(Q)mingw32-dlltool + windres = $(Q)mingw32-windres rm = rm -f - cp = cp + cp = $(Q)cp NUL = /dev/null else # mingw32-windows EXEPREFIX = EXEPOSTFIX = .exe SEP = \$(EMPTY_VAR) - nmkdir = mkdir - gcc = gcc - gpp = g++ - ld = ld - ar = ar - objcopy = objcopy - dlltool = dlltool - windres = windres + nmkdir = $(Q)mkdir + gcc = $(Q)gcc + gpp = $(Q)g++ + ld = $(Q)ld + ar = $(Q)ar + objcopy = $(Q)objcopy + dlltool = $(Q)dlltool + windres = $(Q)windres rm = del /f /q - cp = copy /y + cp = $(Q)copy /y NUL = NUL endif @@ -62,7 +77,8 @@ Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(WRC_TARGET) \ $(RSYM_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) - tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw + $(HALFVERBOSEECHO) [RBUILD] makefile.auto + $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: $(WMC_TARGET) ntoskrnl$(SEP)ntoskrnl.mc _____ Modified: branches/xmlbuildsystem/reactos/tools/Makefile --- branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-09 08:04:40 UTC (rev 13898) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-09 08:12:30 UTC (rev 13899) @@ -14,9 +14,11 @@ RMKDIR_HOST_LFLAGS = -g $(RMKDIR_TARGET): $(RMKDIR_OBJECTS) + $(HALFVERBOSEECHO) [LD] $@ ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET) $(RMKDIR_OBJECTS): %.o : %.c + $(HALFVERBOSEECHO) [CC] $< ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@ .PHONY: rmkdir_clean @@ -41,9 +43,11 @@ RSYM_HOST_LFLAGS = -g $(RSYM_TARGET): $(RSYM_OBJECTS) + $(HALFVERBOSEECHO) [LD] $@ ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET) $(RSYM_OBJECTS): %.o : %.c + $(HALFVERBOSEECHO) [CC] $< ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ .PHONY: rsym_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile --- branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-09 08:04:40 UTC (rev 13898) +++ branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-09 08:12:30 UTC (rev 13899) @@ -17,9 +17,11 @@ BUILDNO_HOST_LFLAGS = -g $(BUILDNO_TARGET): $(BUILDNO_OBJECTS) + $(HALFVERBOSEECHO) [LD] $@ ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET) $(BUILDNO_OBJECTS): %.o : %.cpp include$(SEP)reactos$(SEP)version.h + $(HALFVERBOSEECHO) [CC] $< ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ .PHONY: buildno_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/makefile --- branches/xmlbuildsystem/reactos/tools/cdmake/makefile 2005-03-09 08:04:40 UTC (rev 13898) +++ branches/xmlbuildsystem/reactos/tools/cdmake/makefile 2005-03-09 08:12:30 UTC (rev 13899) @@ -15,9 +15,11 @@ CDMAKE_HOST_LFLAGS = -g $(CDMAKE_TARGET): $(CDMAKE_OBJECTS) + $(HALFVERBOSEECHO) [LD] $@ ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET) $(CDMAKE_OBJECTS): %.o : %.c + $(HALFVERBOSEECHO) [CC] $< ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ .PHONY: cdmake_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/makefile --- branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-09 08:04:40 UTC (rev 13898) +++ branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-09 08:12:30 UTC (rev 13899) @@ -14,9 +14,11 @@ NCI_HOST_LFLAGS = -g $(NCI_TARGET): $(NCI_OBJECTS) + $(HALFVERBOSEECHO) [LD] $@ ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_CFLAGS) -o $(NCI_TARGET) $(NCI_OBJECTS): %.o : %.c + $(HALFVERBOSEECHO) [CC] $< ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ .PHONY: nci_clean @@ -45,7 +47,8 @@ $(WIN32K_USER_STUBS) $(NCI_SERVICE_FILES): $(NCI_TARGET) - @$(EXEPREFIX)$(NCI_TARGET) \ + $(HALFVERBOSEECHO) [NCI] $@ + $(Q)$(EXEPREFIX)$(NCI_TARGET) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \ $(KERNEL_SERVICE_TABLE) \ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-09 08:04:40 UTC (rev 13898) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-09 08:12:30 UTC (rev 13899) @@ -165,13 +165,13 @@ void MingwBackend::GenerateGlobalVariables () const { - fprintf ( fMakefile, "mkdir = tools" SSEP "rmkdir" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "bin2res = tools" SSEP "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "cabman = tools" SSEP "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "cdmake = tools" SSEP "cdmake" SSEP "cdmake" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "rsym = tools" SSEP "rsym" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "wrc = tools" SSEP "wrc" SSEP "wrc" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "mkdir = $(Q)tools" SSEP "rmkdir" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "winebuild = $(Q)tools" SSEP "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "bin2res = $(Q)tools" SSEP "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "cabman = $(Q)tools" SSEP "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "cdmake = $(Q)tools" SSEP "cdmake" SSEP "cdmake" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "rsym = $(Q)tools" SSEP "rsym" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "wrc = $(Q)tools" SSEP "wrc" SSEP "wrc" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=", @@ -201,11 +201,14 @@ MingwBackend::GenerateAllTarget () const { fprintf ( fMakefile, "all:" ); + int wrap_count = 0; for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; if ( IncludeInAllTarget ( module ) ) { + if ( wrap_count++ == 5 ) + fprintf ( fMakefile, " \\\n\t\t" ), wrap_count = 0; fprintf ( fMakefile, " %s", FixupTargetFilename ( module.GetPath () ).c_str () ); @@ -316,7 +319,9 @@ MingwModuleHandler* h = MingwModuleHandler::LookupHandler ( module.node.location, module.type ); - h->Process ( module ); + MingwModuleHandler::string_list clean_files; + h->Process ( module, clean_files ); + h->GenerateCleanTarget ( module, clean_files ); h->GenerateDirectoryTargets (); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-09 08:04:40 UTC (rev 13898) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-09 08:12:30 UTC (rev 13899) @@ -12,6 +12,8 @@ typedef set<string> set_string; +#define CLEAN_FILE(f) clean_files.push_back ( f ); /*if ( module.name == "crt" ) printf ( "%s(%i): clean: %s\n", __FILE__, __LINE__, f.c_str() )*/ + map<ModuleType,MingwModuleHandler*>* MingwModuleHandler::handler_map = NULL; set_string @@ -135,21 +137,6 @@ } string -MingwModuleHandler::GetImportLibraryDependencies ( const Module& module ) const -{ - string dependencies ( "" ); - for ( size_t i = 0; i < module.libraries.size (); i++ ) - { - if ( dependencies.size () > 0 ) - dependencies += " "; - const Module* importedModule = module.project.LocateModule ( module.libraries[i]->name ); - assert ( importedModule != NULL ); - dependencies += GetImportLibraryDependency ( *importedModule ); - } - return dependencies; -} - -string MingwModuleHandler::GetModuleDependencies ( const Module& module ) const { if ( module.dependencies.size () == 0 ) @@ -172,10 +159,10 @@ return dependencies; } -string +/*string MingwModuleHandler::GetAllDependencies ( const Module& module ) const { - string dependencies = GetImportLibraryDependencies ( module ); + string dependencies = GetImportMacro ( module ); string s = GetModuleDependencies ( module ); if ( s.length () > 0 ) { @@ -183,7 +170,7 @@ dependencies += s; } return dependencies; -} +}*/ string MingwModuleHandler::GetSourceFilenames ( const Module& module, @@ -241,6 +228,25 @@ return FixupTargetFilename ( ReplaceExtension ( sourceFilename, newExtension ) ); } +void +MingwModuleHandler::GenerateCleanTarget ( + const Module& module, + const string_list& clean_files ) const +{ + if ( 0 == clean_files.size() ) + return; + fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() ); + fprintf ( fMakefile, "%s_clean:\n\t-@$(rm)", module.name.c_str() ); + for ( size_t i = 0; i < clean_files.size(); i++ ) + { + if ( 9==((i+1)%10) ) + fprintf ( fMakefile, " 2>$(NUL)\n\t-@$(rm)" ); + fprintf ( fMakefile, " %s", clean_files[i].c_str() ); + } + fprintf ( fMakefile, " 2>$(NUL)\n" ); + fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() ); +} + string MingwModuleHandler::GetObjectFilenames ( const Module& module ) const { @@ -272,32 +278,38 @@ if ( directory_set.size () == 0 ) return; - set_string::iterator i; + set_string::iterator it; + size_t wrap_count = 0; fprintf ( fMakefile, "directories::" ); - for ( i = directory_set.begin (); - i != directory_set.end (); - i++ ) + for ( it = directory_set.begin (); + it != directory_set.end (); + it++ ) { - if ( IncludeDirectoryTarget ( *i ) ) + if ( IncludeDirectoryTarget ( *it ) ) { + if ( wrap_count++ == 5 ) + fprintf ( fMakefile, " \\\n\t\t" ), wrap_count = 0; fprintf ( fMakefile, " %s", - i->c_str () ); + it->c_str () ); } } fprintf ( fMakefile, "\n\n" ); + wrap_count = 0; - for ( i = directory_set.begin (); - i != directory_set.end (); - i++ ) + for ( it = directory_set.begin (); + it != directory_set.end (); + it++ ) { - if ( IncludeDirectoryTarget ( *i ) ) + if ( IncludeDirectoryTarget ( *it ) ) { + if ( wrap_count++ == 5 ) + fprintf ( fMakefile, " \\\n\t\t" ), wrap_count = 0; fprintf ( fMakefile, "%s ", - i->c_str () ); + it->c_str () ); } } @@ -409,6 +421,23 @@ } string +MingwModuleHandler::GenerateImportLibraryDependenciesFromVector ( + const vector<Library*>& libraries ) const +{ + string dependencies ( "" ); + int wrap_count = 0; + for ( size_t i = 0; i < libraries.size (); i++ ) + { + if ( wrap_count++ == 5 ) + dependencies += " \\\n\t\t", wrap_count = 0; + else if ( dependencies.size () > 0 ) + dependencies += " "; + dependencies += GetImportLibraryDependency ( *libraries[i]->imported_module ); + } + return dependencies; +} + +string MingwModuleHandler::GenerateLinkerParameters ( const Module& module ) const { return GenerateLinkerParametersFromVector ( module.linkerFlags ); @@ -470,6 +499,7 @@ const vector<File*>& files, const vector<Include*>& includes, const vector<Define*>& defines, + const vector<Library*>& libraries, const vector<CompilerFlag*>* compilerFlags, const vector<LinkerFlag*>* linkerFlags, const vector<If*>& ifs, @@ -477,7 +507,9 @@ const string& nasmflags_macro, const string& windresflags_macro, const string& linkerflags_macro, - const string& objs_macro) const + const string& objs_macro, + const string& libs_macro, + const string& linkdeps_macro ) const { size_t i; @@ -508,7 +540,21 @@ linkerParameters.c_str() ); } } - + + if ( libraries.size () > 0 ) + { + string deps = GenerateImportLibraryDependenciesFromVector ( libraries ); + if ( deps.size () > 0 ) + { + fprintf ( + fMakefile, + "%s %s %s\n", + libs_macro.c_str(), + assignmentOperation, + deps.c_str() ); + } + } + if ( files.size () > 0 ) { for ( i = 0; i < files.size (); i++ ) @@ -544,7 +590,11 @@ for ( i = 0; i < ifs.size(); i++ ) { If& rIf = *ifs[i]; - if ( rIf.defines.size() || rIf.includes.size() || rIf.files.size() || rIf.ifs.size() ) + if ( rIf.defines.size() + || rIf.includes.size() + || rIf.libraries.size() + || rIf.files.size() + || rIf.ifs.size() ) { fprintf ( fMakefile, @@ -556,6 +606,7 @@ rIf.files, rIf.includes, rIf.defines, + rIf.libraries, NULL, NULL, rIf.ifs, @@ -563,7 +614,9 @@ nasmflags_macro, windresflags_macro, linkerflags_macro, - objs_macro ); + objs_macro, + libs_macro, + linkdeps_macro ); fprintf ( fMakefile, "endif\n\n" ); @@ -578,13 +631,16 @@ const string& nasmflags_macro, const string& windresflags_macro, const string& linkerflags_macro, - const string& objs_macro) const + const string& objs_macro, + const string& libs_macro, + const string& linkdeps_macro ) const { GenerateMacros ( "=", module.files, module.includes, module.defines, + module.libraries, &module.compilerFlags, &module.linkerFlags, module.ifs, @@ -592,23 +648,56 @@ nasmflags_macro, windresflags_macro, linkerflags_macro, - objs_macro ); - fprintf ( fMakefile, "\n" ); + objs_macro, + libs_macro, + linkdeps_macro ); + if ( module.importLibrary ) + { + string s; + for ( size_t i = 0; i < module.files.size (); i++ ) + { + File& file = *module.files[i]; + string extension = GetExtension ( file.name ); + if ( extension == ".spec" || extension == ".SPEC" ) + { + if ( s.length () > 0 ) + s += " "; + s += GetSpecObjectDependencies ( file.name ); + } + } + if ( s.length () > 0 ) + { + fprintf ( + fMakefile, + "%s += %s\n", + linkdeps_macro.c_str(), + s.c_str() ); + } + } + fprintf ( fMakefile, - "%s += $(PROJECT_CFLAGS)\n\n", + "%s += $(PROJECT_CFLAGS)\n", cflags_macro.c_str () ); fprintf ( fMakefile, - "%s += $(PROJECT_RCFLAGS)\n\n", + "%s += $(PROJECT_RCFLAGS)\n", windresflags_macro.c_str () ); fprintf ( fMakefile, - "%s_LFLAGS += $(PROJECT_LFLAGS)\n\n", + "%s_LFLAGS += $(PROJECT_LFLAGS)\n", module.name.c_str () ); + + fprintf ( + fMakefile, + "%s += $(%s)", + linkdeps_macro.c_str (), + libs_macro.c_str () ); + + fprintf ( fMakefile, "\n" ); } void @@ -622,6 +711,7 @@ "%s: %s\n", objectFilename.c_str (), sourceFilename.c_str () ); + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [CC] $<\n" ); fprintf ( fMakefile, "\t%s -c %s -o %s %s\n", cc.c_str (), @@ -641,6 +731,7 @@ "%s: %s\n", objectFilename.c_str (), sourceFilename.c_str () ); + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [GAS] $<\n" ); fprintf ( fMakefile, "\t%s -x assembler-with-cpp -c %s -o %s -D__ASM__ %s\n", cc.c_str (), @@ -659,9 +750,10 @@ "%s: %s\n", objectFilename.c_str (), sourceFilename.c_str () ); + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [NASM] $<\n" ); fprintf ( fMakefile, "\t%s -f win32 %s -o %s %s\n", - "nasm", + "$(Q)nasm", sourceFilename.c_str (), objectFilename.c_str (), nasmflagsMacro.c_str () ); @@ -673,14 +765,15 @@ const string& windresflagsMacro ) const { string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); - string rciFilename = ReplaceExtension ( sourceFilename, - ".rci" ); - string resFilename = ReplaceExtension ( sourceFilename, - ".res" ); + string rciFilename = ReplaceExtension ( sourceFilename, + ".rci" ); + string resFilename = ReplaceExtension ( sourceFilename, + ".res" ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), sourceFilename.c_str () ); + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WRC] $@\n" ); fprintf ( fMakefile, "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", windresflagsMacro.c_str (), @@ -692,52 +785,66 @@ rciFilename.c_str (), resFilename.c_str () ); fprintf ( fMakefile, - "\t${rm} %s\n", + "\t-@${rm} %s\n", rciFilename.c_str () ); fprintf ( fMakefile, "\t${windres} %s -o %s\n", resFilename.c_str (), objectFilename.c_str () ); fprintf ( fMakefile, - "\t${rm} %s\n", + "\t-@${rm} %s\n", resFilename.c_str () ); } void -MingwModuleHandler::GenerateWinebuildCommands ( const Module& module, - const string& sourceFilename ) const +MingwModuleHandler::GenerateWinebuildCommands ( + const Module& module, + const string& sourceFilename, + string_list& clean_files ) const { string basename = GetBasename ( sourceFilename ); + + string def_file = basename + ".spec.def"; + CLEAN_FILE ( def_file ); + + string stub_file = basename + ".stubs.c"; + CLEAN_FILE ( stub_file ); + fprintf ( fMakefile, - "%s.spec.def: %s\n", - basename.c_str (), + "%s: %s\n", + def_file.c_str (), sourceFilename.c_str () ); + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WINEBLD] $@\n" ); fprintf ( fMakefile, - "\t%s --def=%s -o %s.spec.def\n", + "\t%s --def=%s -o %s\n", "${winebuild}", sourceFilename.c_str (), - basename.c_str () ); + def_file.c_str () ); fprintf ( fMakefile, - "%s.stubs.c: %s\n", - basename.c_str (), + "%s: %s\n", + stub_file.c_str (), sourceFilename.c_str () ); + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WINEBLD] $@\n" ); fprintf ( fMakefile, - "\t%s --pedll=%s -o %s.stubs.c\n", + "\t%s --pedll=%s -o %s\n", "${winebuild}", sourceFilename.c_str (), - basename.c_str () ); + stub_file.c_str () ); } void -MingwModuleHandler::GenerateCommands ( const Module& module, - const string& sourceFilename, - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro ) const +MingwModuleHandler::GenerateCommands ( + const Module& module, + const string& sourceFilename, + const string& cc, + const string& cppc, + const string& cflagsMacro, + const string& nasmflagsMacro, + const string& windresflagsMacro, + string_list& clean_files ) const { + CLEAN_FILE ( GetObjectFilename(sourceFilename) ); string extension = GetExtension ( sourceFilename ); if ( extension == ".c" || extension == ".C" ) { @@ -782,7 +889,8 @@ else if ( extension == ".spec" || extension == ".SPEC" ) { GenerateWinebuildCommands ( module, - sourceFilename ); + sourceFilename, + clean_files ); GenerateGccCommand ( module, GetActualSourceFilename ( sourceFilename ), cc, @@ -798,20 +906,27 @@ } void -MingwModuleHandler::GenerateLinkerCommand ( const Module& module, - const string& linker, - const string& linkerParameters, - const string& objectFilenames ) const +MingwModuleHandler::GenerateLinkerCommand ( + const Module& module, + const string& linker, + const string& linkerParameters, + const string& objectsMacro, + const string& libsMacro, + string_list& clean_files ) const { + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" ); string targetName ( module.GetTargetName () ); string target ( FixupTargetFilename ( module.GetPath () ) ); - string importLibraryDependencies = GetImportLibraryDependencies ( module ); if ( module.importLibrary != NULL ) { static string ros_junk ( "$(ROS_TEMPORARY)" ); string base_tmp = ros_junk + module.name + ".base.tmp"; + CLEAN_FILE ( base_tmp ); string junk_tmp = ros_junk + module.name + ".junk.tmp"; + CLEAN_FILE ( junk_tmp ); string temp_exp = ros_junk + module.name + ".temp.exp"; + CLEAN_FILE ( temp_exp ); + string def_file = module.GetBasePath () + SSEP + module.importLibrary->definition; fprintf ( fMakefile, "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n", @@ -819,12 +934,12 @@ linkerParameters.c_str (), base_tmp.c_str (), junk_tmp.c_str (), - objectFilenames.c_str (), - importLibraryDependencies.c_str (), + objectsMacro.c_str (), + libsMacro.c_str (), GetLinkerMacro ( module ).c_str () ); fprintf ( fMakefile, - "\t${rm} %s\n", + "\t-@${rm} %s\n", junk_tmp.c_str () ); string killAt = module.mangledSymbols ? "" : "--kill-at"; @@ -832,26 +947,26 @@ "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s %s\n", targetName.c_str (), base_tmp.c_str (), - ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + def_file.c_str (), temp_exp.c_str (), killAt.c_str () ); fprintf ( fMakefile, - "\t${rm} %s\n", + "\t-@${rm} %s\n", base_tmp.c_str () ); fprintf ( fMakefile, - "\t%s %s %s -o %s %s %s %s\n\n", + "\t%s %s %s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), temp_exp.c_str (), target.c_str (), - objectFilenames.c_str (), - importLibraryDependencies.c_str (), + objectsMacro.c_str (), + libsMacro.c_str (), GetLinkerMacro ( module ).c_str () ); fprintf ( fMakefile, - "\t${rm} %s\n\n", + "\t-@${rm} %s\n", temp_exp.c_str () ); } else @@ -861,26 +976,29 @@ linker.c_str (), linkerParameters.c_str (), target.c_str (), - objectFilenames.c_str (), - importLibraryDependencies.c_str (), + objectsMacro.c_str (), + libsMacro.c_str (), GetLinkerMacro ( module ).c_str () ); } + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [RSYM] $@\n" ); fprintf ( fMakefile, - "\t${rsym} %s %s\n\n", - target.c_str (), - target.c_str () ); + "\t${rsym} %s %s\n\n", + target.c_str (), + target.c_str () ); } void -MingwModuleHandler::GenerateObjectFileTargets ( const Module& module, - const vector<File*>& files, - const vector<If*>& ifs, - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro ) const +MingwModuleHandler::GenerateObjectFileTargets ( + const Module& module, + const vector<File*>& files, + const vector<If*>& ifs, + const string& cc, + const string& cppc, + const string& cflagsMacro, + const string& nasmflagsMacro, + const string& windresflagsMacro, + string_list& clean_files ) const { size_t i; @@ -893,7 +1011,8 @@ cppc, cflagsMacro, nasmflagsMacro, - windresflagsMacro ); + windresflagsMacro, + clean_files ); fprintf ( fMakefile, "\n" ); } @@ -907,17 +1026,20 @@ cppc, cflagsMacro, nasmflagsMacro, - windresflagsMacro ); + windresflagsMacro, + clean_files ); } } void -MingwModuleHandler::GenerateObjectFileTargets ( const Module& module, - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro ) const +MingwModuleHandler::GenerateObjectFileTargets ( + const Module& module, + const string& cc, + const string& cppc, + const string& cflagsMacro, + const string& nasmflagsMacro, + const string& windresflagsMacro, + string_list& clean_files ) const { GenerateObjectFileTargets ( module, module.files, @@ -926,12 +1048,13 @@ cppc, cflagsMacro, nasmflagsMacro, - windresflagsMacro ); + windresflagsMacro, + clean_files ); fprintf ( fMakefile, "\n" ); } void -MingwModuleHandler::GetCleanTargets ( vector<string>& out, +MingwModuleHandler::GetCleanTargets ( string_list& out, const vector<File*>& files, const vector<If*>& ifs ) const { @@ -956,6 +1079,8 @@ archiveFilename.c_str (), objs_macro.c_str ()); + fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [AR] $@\n" ); + fprintf ( fMakefile, "\t%s -rc %s %s\n\n", ar.c_str (), @@ -980,12 +1105,24 @@ } string +MingwModuleHandler::GetLinkingDependenciesMacro ( const Module& module ) const +{ + return ssprintf ( "$(%s_LINKDEPS)", module.name.c_str () ); +} + +string +MingwModuleHandler::GetLibsMacro ( const Module& module ) const +{ + return ssprintf ( "$(%s_LIBS)", module.name.c_str () ); +} + +string MingwModuleHandler::GetLinkerMacro ( const Module& module ) const { return ssprintf ( "$(%s_LFLAGS)", module.name.c_str () ); } - + void MingwModuleHandler::GenerateMacrosAndTargets ( const Module& module, @@ -993,20 +1130,25 @@ const string& cppc, const string& ar, const string* cflags, - const string* nasmflags ) const + const string* nasmflags, + string_list& clean_files ) const { string cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); string nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); string windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); string linkerFlagsMacro = ssprintf ("%s_LFLAGS", module.name.c_str ()); string objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ()); + string libsMacro = ssprintf("%s_LIBS", module.name.c_str ()); + string linkDepsMacro = ssprintf ("%s_LINKDEPS", module.name.c_str ()); GenerateMacros ( module, cflagsMacro, nasmflagsMacro, windresflagsMacro, linkerFlagsMacro, - objectsMacro ); + objectsMacro, + libsMacro, + linkDepsMacro ); if ( cflags != NULL ) { @@ -1042,55 +1184,59 @@ cppc, cflagsMacro, nasmflagsMacro, - windresflagsMacro ); + windresflagsMacro, + clean_files ); - vector<string> clean_files; - clean_files.push_back ( FixupTargetFilename(module.GetPath()) ); - clean_files.push_back ( ar_target ); - GetCleanTargets ( clean_files, module.files, module.ifs ); - - fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() ); - fprintf ( fMakefile, "%s_clean:\n\t-@$(rm)", module.name.c_str() ); - for ( size_t i = 0; i < clean_files.size(); i++ ) + CLEAN_FILE ( ar_target ); + string tgt = FixupTargetFilename(module.GetPath()); + if ( tgt != ar_target ) { - if ( 9==(i%10) ) - fprintf ( fMakefile, " 2>$(NUL)\n\t-@$(rm)" ); - fprintf ( fMakefile, " %s", clean_files[i].c_str() ); + CLEAN_FILE ( tgt ); } - fprintf ( fMakefile, " 2>$(NUL)\n" ); - fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() ); } void -MingwModuleHandler::GenerateMacrosAndTargetsHost ( const Module& module ) const +MingwModuleHandler::GenerateMacrosAndTargetsHost ( + const Module& module, + string_list& clean_files ) const { - GenerateMacrosAndTargets ( module, - "${host_gcc}", - "${host_gpp}", - "${host_ar}", - NULL, - NULL ); + GenerateMacrosAndTargets ( + module, + "${host_gcc}", + "${host_gpp}", + "${host_ar}", + NULL, + NULL, + clean_files ); } void -MingwModuleHandler::GenerateMacrosAndTargetsTarget ( const Module& module ) const +MingwModuleHandler::GenerateMacrosAndTargetsTarget ( + const Module& module, + string_list& clean_files ) const { - GenerateMacrosAndTargetsTarget ( module, - NULL, - NULL ); + GenerateMacrosAndTargetsTarget ( + module, + NULL, + NULL, + clean_files ); } void -MingwModuleHandler::GenerateMacrosAndTargetsTarget ( const Module& module, - const string* cflags, - const string* nasmflags ) const +MingwModuleHandler::GenerateMacrosAndTargetsTarget ( + const Module& module, + const string* cflags, + const string* nasmflags, + string_list& clean_files ) const [truncated at 1000 lines; 1274 more skipped]

19 years, 9 months

[royce] 13898: set eolstyle to native

by royce＠svn.reactos.com

set eolstyle to native Property changes on: branches/xmlbuildsystem/reactos/tools/wrc/makefile ___________________________________________________________________ Name: svn:eol-style + native

19 years, 9 months

[weiden] 13897: 1. fixed querying tokens

by weiden＠svn.reactos.com

1. fixed querying tokens 2. implemented calling vectored exception handlers Modified: branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def Modified: branches/alex_devel_branch/reactos/lib/ntdll/rtl/exception.c Modified: branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c Modified: branches/alex_devel_branch/reactos/lib/rtl/sid.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/ipi.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/token.c Modified: branches/alex_devel_branch/reactos/w32api/include/ddk/ntifs.h _____ Modified: branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def --- branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def 2005-03-09 00:04:13 UTC (rev 13897) @@ -363,7 +363,7 @@ RtlCustomCPToUnicodeN@24 RtlCutoverTimeToSystemTime@16 RtlDeNormalizeProcessParams@4 -RtlDecodePointer@4=RtlEncodePointer@4 +RtlDecodePointer=RtlEncodePointer@4 RtlDecompressBuffer@24 RtlDecompressFragment@32 RtlDelete@4 _____ Modified: branches/alex_devel_branch/reactos/lib/ntdll/rtl/exception.c --- branches/alex_devel_branch/reactos/lib/ntdll/rtl/exception.c 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/lib/ntdll/rtl/exception.c 2005-03-09 00:04:13 UTC (rev 13897) @@ -31,6 +31,10 @@ PVECTORED_EXCEPTION_HANDLER VectoredHandler; } RTL_VECTORED_EXCEPTION_HANDLER, *PRTL_VECTORED_EXCEPTION_HANDLER; +/* FIXME - stupid ld won't resolve RtlDecodePointer! Since their implementation + is the same just use RtlEncodePointer for now! */ +#define RtlDecodePointer RtlEncodePointer + /* FUNCTIONS ***************************************************************/ VOID STDCALL @@ -44,20 +48,63 @@ RtlpDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, IN PCONTEXT Context); +EXCEPTION_DISPOSITION +RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) +{ + PLIST_ENTRY CurrentEntry; + PRTL_VECTORED_EXCEPTION_HANDLER veh; + PVECTORED_EXCEPTION_HANDLER VectoredHandler; + EXCEPTION_POINTERS ExceptionInfo; + + ExceptionInfo.ExceptionRecord = ExceptionRecord; + ExceptionInfo.ContextRecord = Context; + + if(RtlpVectoredExceptionHead.Flink != &RtlpVectoredExceptionHead) + { + RtlEnterCriticalSection(&RtlpVectoredExceptionLock); + for(CurrentEntry = RtlpVectoredExceptionHead.Flink; + CurrentEntry != &RtlpVectoredExceptionHead; + CurrentEntry = CurrentEntry->Flink) + { + veh = CONTAINING_RECORD(CurrentEntry, + RTL_VECTORED_EXCEPTION_HANDLER, + ListEntry); + VectoredHandler = RtlDecodePointer(veh->VectoredHandler); + if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) + { + RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); + return ExceptionContinueSearch; + } + } + RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); + } + + return ExceptionContinueExecution; +} + VOID STDCALL KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord, PCONTEXT Context) { EXCEPTION_RECORD NestedExceptionRecord; NTSTATUS Status; - - if (RtlpDispatchException(ExceptionRecord, Context) != ExceptionContinueExecution) + + if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, + Context) != ExceptionContinueExecution) { Status = NtContinue(Context, FALSE); } else { - Status = NtRaiseException(ExceptionRecord, Context, FALSE); + if(RtlpDispatchException(ExceptionRecord, Context) != ExceptionContinueExecution) + { + Status = NtContinue(Context, FALSE); + } + else + { + Status = NtRaiseException(ExceptionRecord, Context, FALSE); + } } NestedExceptionRecord.ExceptionCode = Status; _____ Modified: branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c --- branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c 2005-03-09 00:04:13 UTC (rev 13897) @@ -131,7 +131,7 @@ if(!NT_SUCCESS(Status)) { DPRINT1("Failed to receive the process cookie! Status: 0x%x\n", Status); - return NULL; + return Pointer; } return (PVOID)((ULONG_PTR)Pointer ^ Cookie); _____ Modified: branches/alex_devel_branch/reactos/lib/rtl/sid.c --- branches/alex_devel_branch/reactos/lib/rtl/sid.c 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/lib/rtl/sid.c 2005-03-09 00:04:13 UTC (rev 13897) @@ -200,7 +200,7 @@ RtlCopySid(SidLength, SidArea, Src[i].Sid); - SidArea = SidArea + SidLength; + SidArea = (PVOID)((ULONG_PTR)SidArea + SidLength); } *RemainingSidArea = SidArea; *RemainingSidAreaSize = Length; _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h 2005-03-09 00:04:13 UTC (rev 13897) @@ -377,10 +377,8 @@ else if(ClassList[Class].RequiredSize##Mode > 0 && \ (BufferLen) != ClassList[Class].RequiredSize##Mode) \ { \ - if((!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) && \ - (BufferLen) != ClassList[Class].RequiredSize##Mode) || \ - ((ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) && \ - (BufferLen) < ClassList[Class].RequiredSize##Mode)) \ + if(!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) && \ + (BufferLen) != ClassList[Class].RequiredSize##Mode) \ { \ *(StatusVar) = STATUS_INFO_LENGTH_MISMATCH; \ } \ _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c 2005-03-09 00:04:13 UTC (rev 13897) @@ -513,7 +513,7 @@ #endif Prcb->DpcRoutineActive = TRUE; - DPRINT("&Pcr->PrcbData.DpcData[0].DpcListHead: %x\n", &Prcb->DpcData[0].DpcListHead); + DPRINT("&Prcb->DpcData[0].DpcListHead: %x\n", &Prcb->DpcData[0].DpcListHead); /* Loop while we have entries */ while (!IsListEmpty(&Prcb->DpcData[0].DpcListHead)) { _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/ipi.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/ipi.c 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/ipi.c 2005-03-09 00:04:13 UTC (rev 13897) @@ -119,18 +119,18 @@ KiIpiSendPacket(ULONG TargetSet, VOID STDCALL (*WorkerRoutine)(PVOID), PVOID Argument, ULONG Count, BOOLEAN Synchronize) { ULONG i, Processor, CurrentProcessor; - PKPCR Pcr, CurrentPcr; + PKPRCB Prcb, CurrentPrcb; KIRQL oldIrql; ASSERT(KeGetCurrentIrql() == SYNCH_LEVEL); - CurrentPcr = KeGetCurrentKPCR(); - InterlockedExchangeUL(&CurrentPcr->PrcbData.TargetSet, TargetSet); - InterlockedExchangeUL(&CurrentPcr->PrcbData.WorkerRoutine, (ULONG_PTR)WorkerRoutine); - InterlockedExchangePointer(&CurrentPcr->PrcbData.CurrentPacket[0], Argument); - InterlockedExchangeUL(&CurrentPcr->PrcbData.CurrentPacket[1], Count); - InterlockedExchangeUL(&CurrentPcr->PrcbData.CurrentPacket[2], Synchronize ? 1 : 0); + CurrentPrcb = KeGetCurrentPrcb(); + InterlockedExchangeUL(&CurrentPrcb->TargetSet, TargetSet); + InterlockedExchangeUL(&CurrentPrcb->WorkerRoutine, (ULONG_PTR)WorkerRoutine); + InterlockedExchangePointer(&CurrentPrcb->CurrentPacket[0], Argument); + InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[1], Count); + InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[2], Synchronize ? 1 : 0); CurrentProcessor = 1 << KeGetCurrentProcessorNumber(); @@ -138,9 +138,9 @@ { if (TargetSet & Processor) { - Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); - while(0 != InterlockedCompareExchangeUL(&Pcr->PrcbData.SignalDone, (LONG)&CurrentPcr->PrcbData, 0)); - Ke386TestAndSetBit(IPI_REQUEST_FUNCTIONCALL, &Pcr->PrcbData.IpiFrozen); + Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; + while(0 != InterlockedCompareExchangeUL(&Prcb->SignalDone, (LONG)CurrentPrcb, 0)); + Ke386TestAndSetBit(IPI_REQUEST_FUNCTIONCALL, &Prcb->IpiFrozen); if (Processor != CurrentProcessor) { HalRequestIpi(i); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/token.c --- branches/alex_devel_branch/reactos/ntoskrnl/se/token.c 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/ntoskrnl/se/token.c 2005-03-09 00:04:13 UTC (rev 13897) @@ -643,7 +643,6 @@ if(!NT_SUCCESS(Status)) { - /* Invalid buffers */ DPRINT("NtQueryInformationToken() failed, Status: 0x%x\n", Status); return Status; } @@ -664,15 +663,15 @@ DPRINT("NtQueryInformationToken(TokenUser)\n"); RequiredLength = sizeof(TOKEN_USER) + - RtlLengthSidAndAttributes(1, Token->UserAndGroups); + RtlLengthSid(Token->UserAndGroups[0].Sid); _SEH_TRY { if(TokenInformationLength >= RequiredLength) { Status = RtlCopySidAndAttributesArray(1, - Token->UserAndGroups, - RequiredLength, + &Token->UserAndGroups[0], + RequiredLength - sizeof(TOKEN_USER), &tu->User, (PSID)(tu + 1), &Unused.Ptr, @@ -702,21 +701,22 @@ PTOKEN_GROUPS tg = (PTOKEN_GROUPS)TokenInformation; DPRINT("NtQueryInformationToken(TokenGroups)\n"); - RequiredLength = sizeof(TOKEN_GROUPS) + - RtlLengthSidAndAttributes(Token->UserAndGroupCount - 1, &Token->UserAndGroups[1]) + - sizeof(SID_AND_ATTRIBUTES); + RequiredLength = sizeof(tg->GroupCount) + + RtlLengthSidAndAttributes(Token->UserAndGroupCount - 1, &Token->UserAndGroups[1]); _SEH_TRY { if(TokenInformationLength >= RequiredLength) { - PSID_AND_ATTRIBUTES Sid = (PSID_AND_ATTRIBUTES)((ULONG_PTR)TokenInformation + - RequiredLength - sizeof(SID_AND_ATTRIBUTES)); + ULONG SidLen = RequiredLength - sizeof(tg->GroupCount) - + ((Token->UserAndGroupCount - 1) * sizeof(SID_AND_ATTRIBUTES)); + PSID_AND_ATTRIBUTES Sid = (PSID_AND_ATTRIBUTES)((ULONG_PTR)TokenInformation + sizeof(tg->GroupCount) + + ((Token->UserAndGroupCount - 1) * sizeof(SID_AND_ATTRIBUTES))); tg->GroupCount = Token->UserAndGroupCount - 1; Status = RtlCopySidAndAttributesArray(Token->UserAndGroupCount - 1, &Token->UserAndGroups[1], - RequiredLength, + SidLen, &tg->Groups[0], (PSID)Sid, &Unused.Ptr, @@ -746,7 +746,7 @@ PTOKEN_PRIVILEGES tp = (PTOKEN_PRIVILEGES)TokenInformation; DPRINT("NtQueryInformationToken(TokenPrivileges)\n"); - RequiredLength = sizeof(TOKEN_PRIVILEGES) + + RequiredLength = sizeof(tp->PrivilegeCount) + (Token->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); _SEH_TRY @@ -1096,6 +1096,7 @@ { _SEH_TRY { + /* buffer size was already verified, no need to check here again */ *(PULONG)TokenInformation = SessionId; if(ReturnLength != NULL) @@ -1357,6 +1358,7 @@ _SEH_TRY { + /* buffer size was already verified, no need to check here again */ SessionId = *(PULONG)TokenInformation; } _SEH_HANDLE _____ Modified: branches/alex_devel_branch/reactos/w32api/include/ddk/ntifs.h --- branches/alex_devel_branch/reactos/w32api/include/ddk/ntifs.h 2005-03-08 23:33:28 UTC (rev 13896) +++ branches/alex_devel_branch/reactos/w32api/include/ddk/ntifs.h 2005-03-09 00:04:13 UTC (rev 13897) @@ -1218,13 +1218,23 @@ ULONG LastIndexValue; } GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT; +typedef struct _HANDLE_TABLE_ENTRY_INFO { + ULONG AuditMask; +} HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO; + typedef struct _HANDLE_TABLE_ENTRY { - PVOID Object; - ULONG ObjectAttributes; - ULONG GrantedAccess; - USHORT GrantedAccessIndex; - USHORT CreatorBackTraceIndex; - ULONG NextFreeTableEntry; + union { + PVOID Object; + ULONG ObAttributes; + PHANDLE_TABLE_ENTRY_INFO InfoTable; + ULONG_PTR Value; + } u1; + union { + ULONG GrantedAccess; + USHORT GrantedAccessIndex; + LONG NextFreeTableEntry; + } u2; + USHORT CreatorBackTraceIndex; } HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY; typedef struct _MAPPING_PAIR {

19 years, 9 months

[ion] 13896: Merge to 13895. Remove ACPI static compiler flag and used dynamic variable with detection done through Freeloader (still some work left). Add more profile code and begin tiny work on Io functions.

by ion＠svn.reactos.com

Merge to 13895. Remove ACPI static compiler flag and used dynamic variable with detection done through Freeloader (still some work left). Add more profile code and begin tiny work on Io functions. Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/arch/i386/hwacpi .c Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/include/multiboo t.h Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/reactos/reactos. c Modified: branches/alex_devel_branch/reactos/config Added: branches/alex_devel_branch/reactos/doc/irp cancel boilerplate.c Modified: branches/alex_devel_branch/reactos/drivers/bus/acpi/tables/tbget.c Modified: branches/alex_devel_branch/reactos/drivers/fs/np/create.c Modified: branches/alex_devel_branch/reactos/drivers/fs/np/fsctrl.c Modified: branches/alex_devel_branch/reactos/drivers/fs/np/rw.c Modified: branches/alex_devel_branch/reactos/drivers/fs/np/volume.c Modified: branches/alex_devel_branch/reactos/drivers/video/displays/vga/main/enabl e.c Modified: branches/alex_devel_branch/reactos/hal/halx86/generic/timer.c Modified: branches/alex_devel_branch/reactos/hal/halx86/include/apic.h Modified: branches/alex_devel_branch/reactos/hal/halx86/include/hal.h Added: branches/alex_devel_branch/reactos/hal/halx86/include/ioapic.h Modified: branches/alex_devel_branch/reactos/hal/halx86/include/mps.h Modified: branches/alex_devel_branch/reactos/hal/halx86/mp/Makefile Modified: branches/alex_devel_branch/reactos/hal/halx86/mp/apic.c Modified: branches/alex_devel_branch/reactos/hal/halx86/mp/halinit_mp.c Added: branches/alex_devel_branch/reactos/hal/halx86/mp/ioapic.c Added: branches/alex_devel_branch/reactos/hal/halx86/mp/mpconfig.c Modified: branches/alex_devel_branch/reactos/hal/halx86/mp/mpsirql.c Modified: branches/alex_devel_branch/reactos/hal/halx86/mp/processor_mp.c Modified: branches/alex_devel_branch/reactos/include/win32k/dc.h Added: branches/alex_devel_branch/reactos/lib/cpl/appwiz/De.rc Added: branches/alex_devel_branch/reactos/lib/cpl/appwiz/En.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/appwiz/appwiz.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/appwiz/resources/applet.ico Added: branches/alex_devel_branch/reactos/lib/cpl/control/De.rc Added: branches/alex_devel_branch/reactos/lib/cpl/control/En.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/control/control.rc Modified: branches/alex_devel_branch/reactos/lib/kernel32/except/except.c Modified: branches/alex_devel_branch/reactos/lib/rosrtl/misc/intrlck.c Modified: branches/alex_devel_branch/reactos/lib/rpcrt4/rpc_message.c Added: branches/alex_devel_branch/reactos/lib/shellext/slayer/De.rc Modified: branches/alex_devel_branch/reactos/lib/shellext/slayer/slayer.rc Modified: branches/alex_devel_branch/reactos/lib/smdll/connect.c Modified: branches/alex_devel_branch/reactos/lib/user32/windows/bitmap.c Modified: branches/alex_devel_branch/reactos/lib/user32/windows/icon.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/i386/ke.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/kd.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/cancel.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/device.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/driver.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/iomgr.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/irp.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/irq.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/process.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/kernel.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/profile.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/po/power.c Modified: branches/alex_devel_branch/reactos/subsys/system/cmd/cmd.h Modified: branches/alex_devel_branch/reactos/subsys/system/cmd/dir.c Modified: branches/alex_devel_branch/reactos/subsys/system/cmd/error.c Modified: branches/alex_devel_branch/reactos/subsys/system/cmd/precomp.h Modified: branches/alex_devel_branch/reactos/subsys/system/cmd/todo.txt Modified: branches/alex_devel_branch/reactos/subsys/win32k/include/intgdi.h Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/message.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/metric.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/windc.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/winsta.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/bitmaps.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/brush.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/dc.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/dib.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/fillshap.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/line.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/print.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/text.c Modified: branches/alex_devel_branch/reactos/tools/Makefile Modified: branches/alex_devel_branch/reactos/tools/helper.mk Modified: branches/alex_devel_branch/reactos/tools/widl/ChangeLog Modified: branches/alex_devel_branch/reactos/tools/widl/client.c Modified: branches/alex_devel_branch/reactos/tools/widl/header.c Modified: branches/alex_devel_branch/reactos/tools/widl/header.h Modified: branches/alex_devel_branch/reactos/tools/widl/server.c _____ Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/arch/i386/hwacpi .c --- branches/alex_devel_branch/reactos/boot/freeldr/freeldr/arch/i386/hwacpi .c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/boot/freeldr/freeldr/arch/i386/hwacpi .c 2005-03-08 23:33:28 UTC (rev 13896) @@ -28,6 +28,7 @@ #include "../../reactos/registry.h" #include "hardware.h" +BOOLEAN AcpiPresent = FALSE; static BOOL FindAcpiBios(VOID) @@ -63,6 +64,7 @@ if (FindAcpiBios()) { + AcpiPresent = TRUE; /* Create new bus key */ sprintf(Buffer, "MultifunctionAdapter\\%u", *BusNumber); _____ Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/include/multiboo t.h --- branches/alex_devel_branch/reactos/boot/freeldr/freeldr/include/multiboo t.h 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/boot/freeldr/freeldr/include/multiboo t.h 2005-03-08 23:33:28 UTC (rev 13896) @@ -52,6 +52,7 @@ #define MB_INFO_FLAG_BOOT_LOADER_NAME 0x00000200 #define MB_INFO_FLAG_APM_TABLE 0x00000400 #define MB_INFO_FLAG_GRAPHICS_TABLE 0x00000800 +#define MB_INFO_FLAG_ACPI_TABLE 0x00001000 #ifndef ASM /* Do not include here in boot.S. */ _____ Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/reactos/reactos. c --- branches/alex_devel_branch/reactos/boot/freeldr/freeldr/reactos/reactos. c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/boot/freeldr/freeldr/reactos/reactos. c 2005-03-08 23:33:28 UTC (rev 13896) @@ -580,6 +580,7 @@ extern ULONG PageDirectoryStart; extern ULONG PageDirectoryEnd; + extern BOOLEAN AcpiPresent; // // Open the operating system section @@ -596,6 +597,7 @@ * Setup multiboot information structure */ LoaderBlock.Flags = MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES; + if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE; LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.BootDevice = 0xffffffff; _____ Modified: branches/alex_devel_branch/reactos/config --- branches/alex_devel_branch/reactos/config 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/config 2005-03-08 23:33:28 UTC (rev 13896) @@ -26,21 +26,11 @@ DBG := 1 # -# Whether to compile with optimizations -# -OPTIMIZED := 1 - -# # Whether to compile a multiprocessor or single processor version # CONFIG_SMP := 0 # -# Whether to compile for ACPI compliant systems -# -ACPI := 0 - -# # Which version of NDIS do we support up to? # #NDISVERSION=NDIS50 _____ Copied: branches/alex_devel_branch/reactos/doc/irp cancel boilerplate.c (from rev 13856, trunk/reactos/doc/irp cancel boilerplate.c) --- trunk/reactos/doc/irp cancel boilerplate.c 2005-03-06 16:42:36 UTC (rev 13856) +++ branches/alex_devel_branch/reactos/doc/irp cancel boilerplate.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -0,0 +1,103 @@ + + +/* +Boiler plate for irp cancelation, for irp queues you manage yourself +-Gunnar +*/ + + + +CancelRoutine( + DEV_OBJ Dev, + Irp + ) +{ + //don't need this since we have our own sync. protecting irp cancellation + IoReleaseCancelSpinLock(Irp->CancelIrql); + + theLock = Irp->Tail.Overlay.DriverContext[3]; + + Lock(theLock); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} + + +QUEUE_BOLIERPLATE +{ + Lock(theLock); + + Irp->Tail.Overlay.DriverContext[3] = &theLock; + + IoSetCancelRoutine(Irp, CancelRoutine); + if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + /* + Irp has already been cancelled (before we got to queue it), + and we got to remove the cancel routine before the canceler could, + so we cancel/complete the irp ourself. + */ + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return FALSE; + } + + //else were ok + + + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + + InsertTailList(Queue); + + Unlock(theLock); + +} + + +DEQUEUE_BOILERPLATE +{ + Lock(theLock); + + Irp = RemoveHeadList(Queue); + + if (!IoSetCancelRoutine(Irp, NULL)) + { + /* + Cancel routine WILL be called after we release the spinlock. It will try to remove + the irp from the list and cancel/complete this irp. Since we allready removed it, + make its ListEntry point to itself. + */ + + InitializeListHead(&Irp->Tail.Overlay.ListEntry); + + Unlock(theLock); + + return; + } + + + /* + Cancel routine will NOT be called, canceled or not. + The Irp might have been canceled (Irp->Cancel flag set) but we don't care, + since we are to complete this Irp now anyways. + */ + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} _____ Modified: branches/alex_devel_branch/reactos/drivers/bus/acpi/tables/tbget.c --- branches/alex_devel_branch/reactos/drivers/bus/acpi/tables/tbget.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/drivers/bus/acpi/tables/tbget.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -503,7 +503,7 @@ REPORT_ERROR (("Invalid signature where RSDP indicates %s should be located\n", table_signature)); - return (status); + return (AE_NO_ACPI_TABLES); } _____ Modified: branches/alex_devel_branch/reactos/drivers/fs/np/create.c --- branches/alex_devel_branch/reactos/drivers/fs/np/create.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/drivers/fs/np/create.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -54,10 +54,15 @@ while (CurrentEntry != &Pipe->WaiterListHead) { Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); - if (Waiter->Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + if (Waiter->Fcb->PipeState == FILE_PIPE_LISTENING_STATE && + !Waiter->Irp->Cancel) { DPRINT("Server found! Fcb %p\n", Waiter->Fcb); - return Waiter->Fcb; + + if (IoSetCancelRoutine(Waiter->Irp, NULL) != NULL) + { + return Waiter->Fcb; + } } CurrentEntry = CurrentEntry->Flink; @@ -143,39 +148,13 @@ KeUnlockMutex(&DeviceExt->PipeListLock); /* - * Step 2. Search for listening server FCB. - */ - - /* * Acquire the lock for FCB lists. From now on no modifications to the * FCB lists are allowed, because it can cause various misconsistencies. */ KeLockMutex(&Pipe->FcbListLock); - if (!SpecialAccess) - { - ServerFcb = NpfsFindListeningServerInstance(Pipe); - if (ServerFcb == NULL) - { - /* Not found, bail out with error for FILE_OPEN requests. */ - DPRINT("No listening server fcb found!\n"); - KeUnlockMutex(&Pipe->FcbListLock); - Irp->IoStatus.Status = STATUS_PIPE_BUSY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_PIPE_BUSY; - } - } - else if (IsListEmpty(&Pipe->ServerFcbListHead)) - { - DPRINT("No server fcb found!\n"); - KeUnlockMutex(&Pipe->FcbListLock); - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - } - /* - * Step 3. Create the client FCB. + * Step 2. Create the client FCB. */ ClientFcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); if (ClientFcb == NULL) @@ -222,6 +201,73 @@ KeInitializeEvent(&ClientFcb->Event, SynchronizationEvent, FALSE); /* + * Step 3. Search for listening server FCB. + */ + + if (!SpecialAccess) + { + /* + * WARNING: Point of no return! Once we get the server FCB it's + * possible that we completed a wait request and so we have to + * complete even this request. + */ + + ServerFcb = NpfsFindListeningServerInstance(Pipe); + if (ServerFcb == NULL) + { + PLIST_ENTRY CurrentEntry; + PNPFS_FCB Fcb; + + /* + * If no waiting server FCB was found then try to pick + * one of the listing server FCB on the pipe. + */ + + CurrentEntry = Pipe->ServerFcbListHead.Flink; + while (CurrentEntry != &Pipe->ServerFcbListHead) + { + Fcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry); + if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + { + ServerFcb = Fcb; + break; + } + CurrentEntry = CurrentEntry->Flink; + } + + /* + * No one is listening to me?! I'm so lonely... :( + */ + + if (ServerFcb == NULL) + { + /* Not found, bail out with error for FILE_OPEN requests. */ + DPRINT("No listening server fcb found!\n"); + if (ClientFcb->Data) + ExFreePool(ClientFcb->Data); + KeUnlockMutex(&Pipe->FcbListLock); + Irp->IoStatus.Status = STATUS_PIPE_BUSY; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_PIPE_BUSY; + } + } + else + { + /* Signal the server thread and remove it from the waiter list */ + /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ + NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); + } + } + else if (IsListEmpty(&Pipe->ServerFcbListHead)) + { + DPRINT("No server fcb found!\n"); + KeUnlockMutex(&Pipe->FcbListLock); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; + } + + /* * Step 4. Add the client FCB to a list and connect it if possible. */ @@ -235,9 +281,6 @@ ServerFcb->OtherSide = ClientFcb; ClientFcb->PipeState = FILE_PIPE_CONNECTED_STATE; ServerFcb->PipeState = FILE_PIPE_CONNECTED_STATE; - - /* Signal the server thread and remove it from the waiter list */ - NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); } KeUnlockMutex(&Pipe->FcbListLock); _____ Modified: branches/alex_devel_branch/reactos/drivers/fs/np/fsctrl.c --- branches/alex_devel_branch/reactos/drivers/fs/np/fsctrl.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/drivers/fs/np/fsctrl.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -25,18 +25,19 @@ PNPFS_WAITER_ENTRY Waiter; DPRINT1("NpfsListeningCancelRoutine() called\n"); - /* FIXME: Not tested. */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + Waiter = Irp->Tail.Overlay.DriverContext[0]; + KeLockMutex(&Waiter->Pipe->FcbListLock); RemoveEntryList(&Waiter->Entry); - ExFreePool(Waiter); + KeUnlockMutex(&Waiter->Pipe->FcbListLock); - IoReleaseCancelSpinLock(Irp->CancelIrql); - Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); + ExFreePool(Waiter); } @@ -45,7 +46,6 @@ PNPFS_FCB Fcb) { PNPFS_WAITER_ENTRY Entry; - KIRQL OldIrql; Entry = ExAllocatePool(NonPagedPool, sizeof(NPFS_WAITER_ENTRY)); if (Entry == NULL) @@ -53,22 +53,28 @@ Entry->Irp = Irp; Entry->Fcb = Fcb; + Entry->Pipe = Fcb->Pipe; + + KeLockMutex(&Fcb->Pipe->FcbListLock); + + IoMarkIrpPending(Irp); + Irp->Tail.Overlay.DriverContext[0] = Entry; InsertTailList(&Fcb->Pipe->WaiterListHead, &Entry->Entry); - IoAcquireCancelSpinLock(&OldIrql); + IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); + if (!Irp->Cancel) { - Irp->Tail.Overlay.DriverContext[0] = Entry; - IoMarkIrpPending(Irp); - IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); - IoReleaseCancelSpinLock(OldIrql); + KeUnlockMutex(&Fcb->Pipe->FcbListLock); return STATUS_PENDING; } - /* IRP has already been cancelled */ - IoReleaseCancelSpinLock(OldIrql); - - DPRINT1("FIXME: Remove waiter entry!\n"); + RemoveEntryList(&Entry->Entry); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + KeUnlockMutex(&Fcb->Pipe->FcbListLock); ExFreePool(Entry); return STATUS_CANCELLED; _____ Modified: branches/alex_devel_branch/reactos/drivers/fs/np/rw.c --- branches/alex_devel_branch/reactos/drivers/fs/np/rw.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/drivers/fs/np/rw.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -165,7 +165,10 @@ if (Length == 0) { - KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + } KeResetEvent(&Fcb->Event); break; } @@ -197,6 +200,11 @@ } else { + KeResetEvent(&Fcb->Event); + if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + } Fcb->ReadDataAvailable = 0; Fcb->WriteQuotaAvailable = Fcb->MaxDataLength; } @@ -204,11 +212,6 @@ if (Information > 0) { - if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); - } - KeResetEvent(&Fcb->Event); break; } } @@ -383,12 +386,12 @@ ReaderFcb->WriteQuotaAvailable = 0; } - if (Information > 0) - { - KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); - KeResetEvent(&Fcb->Event); - break; - } + if (Information > 0) + { + KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); + KeResetEvent(&Fcb->Event); + break; + } } } _____ Modified: branches/alex_devel_branch/reactos/drivers/fs/np/volume.c --- branches/alex_devel_branch/reactos/drivers/fs/np/volume.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/drivers/fs/np/volume.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -36,7 +36,7 @@ DPRINT("NpfsQueryFsDeviceInformation() finished.\n"); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } _____ Modified: branches/alex_devel_branch/reactos/drivers/video/displays/vga/main/enabl e.c --- branches/alex_devel_branch/reactos/drivers/video/displays/vga/main/enabl e.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/drivers/video/displays/vga/main/enabl e.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -266,6 +266,9 @@ GDIInfoSize = sizeof(GDIINFO); } memcpy(GDIInfo, &gaulCap, GDIInfoSize); + DM->dmBitsPerPel = gaulCap.cBitsPixel * gaulCap.cPlanes; + DM->dmPelsWidth = gaulCap.ulHorzRes; + DM->dmPelsHeight = gaulCap.ulVertRes; devinfoVGA.hpalDefault = EngCreatePalette(PAL_INDEXED, 16, (ULONG *) VGApalette.PaletteEntry, 0, 0, 0); if (sizeof(DEVINFO) < DevInfoSize) _____ Modified: branches/alex_devel_branch/reactos/hal/halx86/generic/timer.c --- branches/alex_devel_branch/reactos/hal/halx86/generic/timer.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/hal/halx86/generic/timer.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -165,7 +165,7 @@ } -static VOID WaitFor8254Wraparound(VOID) +VOID WaitFor8254Wraparound(VOID) { ULONG CurCount, PrevCount = ~0; LONG Delta; _____ Modified: branches/alex_devel_branch/reactos/hal/halx86/include/apic.h --- branches/alex_devel_branch/reactos/hal/halx86/include/apic.h 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/hal/halx86/include/apic.h 2005-03-08 23:33:28 UTC (rev 13896) @@ -145,7 +145,16 @@ #define APIC_INTEGRATED(version) (version & 0xF0) +typedef enum { + amPIC = 0, /* IMCR and PIC compatibility mode */ + amVWIRE /* Virtual Wire compatibility mode */ +} APIC_MODE; + +#ifdef CONFIG_SMP #define MAX_CPU 32 +#else +#define MAX_CPU 1 +#endif /* * Local APIC timer IRQ vector is on a different priority level, @@ -158,6 +167,11 @@ #define ERROR_VECTOR 0xFE #define SPURIOUS_VECTOR 0xFF /* Must be 0xXF */ +/* CPU flags */ +#define CPU_USABLE 0x01 /* 1 if the CPU is usable (ie. can be used) */ +#define CPU_ENABLED 0x02 /* 1 if the CPU is enabled */ +#define CPU_BSP 0x04 /* 1 if the CPU is the bootstrap processor */ +#define CPU_TSC 0x08 /* 1 if the CPU has a time stamp counter */ typedef struct _CPU_INFO { @@ -170,23 +184,26 @@ UCHAR Padding[16-12]; /* Padding to 16-byte */ } CPU_INFO, *PCPU_INFO; +extern ULONG CPUCount; /* Total number of CPUs */ +extern ULONG BootCPU; /* Bootstrap processor */ +extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ +extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ /* Prototypes */ - +inline VOID APICWrite(ULONG Offset, ULONG Value); inline ULONG APICRead(ULONG Offset); -inline VOID APICWrite(ULONG Offset, ULONG Value); VOID APICSendIPI(ULONG Target, ULONG Mode); - -ULONG APICGetMaxLVT(VOID); VOID APICSetup(VOID); VOID HaliInitBSP(VOID); VOID APICSyncArbIDs(VOID); inline VOID APICSendEOI(VOID); +VOID APICCalibrateTimer(ULONG CPU); +VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); static inline ULONG ThisCPU(VOID) { - return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; } _____ Modified: branches/alex_devel_branch/reactos/hal/halx86/include/hal.h --- branches/alex_devel_branch/reactos/hal/halx86/include/hal.h 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/hal/halx86/include/hal.h 2005-03-08 23:33:28 UTC (rev 13896) @@ -413,6 +413,8 @@ #define Ki386EnableInterrupts() __asm__ __volatile__("sti\n\t") #define Ki386HaltProcessor() __asm__ __volatile__("hlt\n\t") #define Ki386RdTSC(x) __asm__ __volatile__("rdtsc\n\t" : "=A" (x.u.LowPart), "=d" (x.u.HighPart)); +#define Ki386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) +#define Ki386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) static inline BYTE Ki386ReadFsByte(ULONG offset) { _____ Copied: branches/alex_devel_branch/reactos/hal/halx86/include/ioapic.h (from rev 13894, trunk/reactos/hal/halx86/include/ioapic.h) _____ Modified: branches/alex_devel_branch/reactos/hal/halx86/include/mps.h --- branches/alex_devel_branch/reactos/hal/halx86/include/mps.h 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/hal/halx86/include/mps.h 2005-03-08 23:33:28 UTC (rev 13896) @@ -9,77 +9,7 @@ #define IRQL2TPR(irql) ((irql) >= IPI_LEVEL ? IPI_VECTOR : ((irql) >= PROFILE_LEVEL ? LOCAL_TIMER_VECTOR : ((irql) > DISPATCH_LEVEL ? IRQL2VECTOR(irql) : 0))) -#define IOAPIC_DEFAULT_BASE 0xFEC00000 /* Default I/O APIC Base Register Address */ -/* I/O APIC Register Address Map */ -#define IOAPIC_IOREGSEL 0x0000 /* I/O Register Select (index) (R/W) */ -#define IOAPIC_IOWIN 0x0010 /* I/O window (data) (R/W) */ - -#define IOAPIC_ID 0x0000 /* IO APIC ID (R/W) */ -#define IOAPIC_VER 0x0001 /* IO APIC Version (R) */ -#define IOAPIC_ARB 0x0002 /* IO APIC Arbitration ID (R) */ -#define IOAPIC_REDTBL 0x0010 /* Redirection Table (0-23 64-bit registers) (R/W) */ - -#define IOAPIC_ID_MASK (0xF << 24) -#define GET_IOAPIC_ID(x) (((x) & IOAPIC_ID_MASK) >> 24) -#define SET_IOAPIC_ID(x) ((x) << 24) - -#define IOAPIC_VER_MASK (0xFF) -#define GET_IOAPIC_VERSION(x) (((x) & IOAPIC_VER_MASK)) -#define IOAPIC_MRE_MASK (0xFF << 16) /* Maximum Redirection Entry */ -#define GET_IOAPIC_MRE(x) (((x) & IOAPIC_MRE_MASK) >> 16) - -#define IOAPIC_ARB_MASK (0xF << 24) -#define GET_IOAPIC_ARB(x) (((x) & IOAPIC_ARB_MASK) >> 24) - -#define IOAPIC_TBL_DELMOD (0x7 << 10) /* Delivery Mode (see APIC_DM_*) */ -#define IOAPIC_TBL_DM (0x1 << 11) /* Destination Mode */ -#define IOAPIC_TBL_DS (0x1 << 12) /* Delivery Status */ -#define IOAPIC_TBL_INTPOL (0x1 << 13) /* Interrupt Input Pin Polarity */ -#define IOAPIC_TBL_RIRR (0x1 << 14) /* Remote IRR */ -#define IOAPIC_TBL_TM (0x1 << 15) /* Trigger Mode */ -#define IOAPIC_TBL_IM (0x1 << 16) /* Interrupt Mask */ -#define IOAPIC_TBL_DF0 (0xF << 56) /* Destination Field (physical mode) */ -#define IOAPIC_TBL_DF1 (0xFF<< 56) /* Destination Field (logical mode) */ -#define IOAPIC_TBL_VECTOR (0xFF << 0) /* Vector (10h - FEh) */ - -typedef struct _IOAPIC_ROUTE_ENTRY { - ULONG vector : 8, - delivery_mode : 3, /* 000: FIXED - * 001: lowest priority - * 111: ExtINT - */ - dest_mode : 1, /* 0: physical, 1: logical */ - delivery_status : 1, - polarity : 1, - irr : 1, - trigger : 1, /* 0: edge, 1: level */ - mask : 1, /* 0: enabled, 1: disabled */ - __reserved_2 : 15; - - union { struct { ULONG - __reserved_1 : 24, - physical_dest : 4, - __reserved_2 : 4; - } physical; - - struct { ULONG - __reserved_1 : 24, - logical_dest : 8; - } logical; - } dest; -} __attribute__ ((packed)) IOAPIC_ROUTE_ENTRY, *PIOAPIC_ROUTE_ENTRY; - -typedef struct _IOAPIC_INFO -{ - ULONG ApicId; /* APIC ID */ - ULONG ApicVersion; /* APIC version */ - ULONG ApicAddress; /* APIC address */ - ULONG EntryCount; /* Number of redirection entries */ -} IOAPIC_INFO, *PIOAPIC_INFO; - - - #if 0 /* This values are defined in halirql.h */ #define FIRST_DEVICE_VECTOR 0x30 @@ -148,14 +78,8 @@ } __attribute__((packed)) MP_CONFIGURATION_PROCESSOR, *PMP_CONFIGURATION_PROCESSOR; -#define CPU_FLAG_ENABLED 1 /* Processor is available */ -#define CPU_FLAG_BSP 2 /* Processor is the bootstrap processor */ -#define CPU_STEPPING_MASK 0x0F -#define CPU_MODEL_MASK 0xF0 -#define CPU_FAMILY_MASK 0xF00 - typedef struct __attribute__((packed)) _MP_CONFIGURATION_BUS { UCHAR Type; /* 1 */ @@ -239,54 +163,20 @@ } MP_CONFIGURATION_INTLOCAL, *PMP_CONFIGURATION_INTLOCAL; #define MP_APIC_ALL 0xFF - - -static inline VOID ReadPentiumClock(PULARGE_INTEGER Count) -{ - register ULONG nLow; - register ULONG nHigh; -#if defined(__GNUC__) - __asm__ __volatile__ ("rdtsc" : "=a" (nLow), "=d" (nHigh)); -#elif defined(_MSC_VER) - __asm rdtsc - __asm mov nLow, eax - __asm mov nHigh, edx -#else -#error Unknown compiler for inline assembler -#endif +#define CPU_FLAG_ENABLED 1 /* Processor is available */ +#define CPU_FLAG_BSP 2 /* Processor is the bootstrap processor */ - Count->u.LowPart = nLow; - Count->u.HighPart = nHigh; -} +#define CPU_STEPPING_MASK 0x0F +#define CPU_MODEL_MASK 0xF0 +#define CPU_FAMILY_MASK 0xF00 - - - -/* CPU flags */ -#define CPU_USABLE 0x01 /* 1 if the CPU is usable (ie. can be used) */ -#define CPU_ENABLED 0x02 /* 1 if the CPU is enabled */ -#define CPU_BSP 0x04 /* 1 if the CPU is the bootstrap processor */ - - -typedef enum { - amPIC = 0, /* IMCR and PIC compatibility mode */ - amVWIRE /* Virtual Wire compatibility mode */ -} APIC_MODE; - - #define PIC_IRQS 16 /* Prototypes */ VOID HalpInitMPS(VOID); -ULONG IOAPICRead(ULONG Apic, ULONG Offset); -VOID IOAPICWrite(ULONG Apic, ULONG Offset, ULONG Value); -VOID IOAPICMaskIrq(ULONG Irq); -VOID IOAPICUnmaskIrq(ULONG Irq); -/* For debugging */ -VOID IOAPICDump(VOID); #endif /* __INCLUDE_HAL_MPS */ _____ Modified: branches/alex_devel_branch/reactos/hal/halx86/mp/Makefile --- branches/alex_devel_branch/reactos/hal/halx86/mp/Makefile 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/hal/halx86/mp/Makefile 2005-03-08 23:33:28 UTC (rev 13896) @@ -61,7 +61,9 @@ MP_OBJECTS = \ apic.o \ halinit_mp.o \ + ioapic.o \ ipi_mp.o \ + mpconfig.o \ mpsirql.o \ mpsboot.o \ mps.o \ _____ Modified: branches/alex_devel_branch/reactos/hal/halx86/mp/apic.c --- branches/alex_devel_branch/reactos/hal/halx86/mp/apic.c 2005-03-08 23:15:34 UTC (rev 13895) +++ branches/alex_devel_branch/reactos/hal/halx86/mp/apic.c 2005-03-08 23:33:28 UTC (rev 13896) @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004, 2005 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 @@ -25,6 +25,8 @@ * PROGRAMMER: */ +/* INCLUDE ***********************************************************************/ + #include <ddk/ntddk.h> #include <internal/i386/ps.h> @@ -36,23 +38,47 @@ #define NDEBUG #include <internal/debug.h> -BOOLEAN VerifyLocalAPIC(VOID); -VOID APICCalibrateTimer(ULONG CPU); +/* GLOBALS ***********************************************************************/ -extern VOID MpsTimerInterrupt(VOID); -extern VOID MpsErrorInterrupt(VOID); -extern VOID MpsSpuriousInterrupt(VOID); -extern VOID MpsIpiInterrupt(VOID); +ULONG CPUCount; /* Total number of CPUs */ +ULONG BootCPU; /* Bootstrap processor */ +ULONG OnlineCPUs; /* Bitmask of online CPUs */ +CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ -extern ULONG APICMode; /* APIC mode at startup */ -extern PULONG BIOSBase; /* Virtual address of BIOS data segment */ -extern PULONG CommonBase; /* Virtual address of common area */ -extern ULONG BootCPU; /* Bootstrap processor */ -extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ +#ifdef CONFIG_SMP +PULONG BIOSBase; /* Virtual address of BIOS data segment */ +PULONG CommonBase; /* Virtual address of common area */ +#endif -extern CHAR *APstart, *APend; -extern VOID (*APflush)(VOID); +PULONG APICBase = (PULONG)APIC_DEFAULT_BASE; /* Virtual address of local APIC */ +ULONG APICMode; /* APIC mode at startup */ + +/* For debugging */ +ULONG lastregr[MAX_CPU]; +ULONG lastvalr[MAX_CPU]; +ULONG lastregw[MAX_CPU]; +ULONG lastvalw[MAX_CPU]; + +#ifdef CONFIG_SMP +typedef struct __attribute__((packed)) _COMMON_AREA_INFO +{ + ULONG Stack; /* Location of AP stack */ + ULONG PageDirectory; /* Page directory for an AP */ + ULONG NtProcessStartup; /* Kernel entry point for an AP */ + ULONG PaeModeEnabled; /* PAE mode is enabled */ + ULONG Debug[16]; /* For debugging */ +} COMMON_AREA_INFO, *PCOMMON_AREA_INFO; +#endif + +CHAR *APstart, *APend; + +#define BIOS_AREA 0x0 +#define COMMON_AREA 0x2000 + +#define HZ (100) +#define APIC_DIVISOR (16) + #define CMOS_READ(address) ({ \ WRITE_PORT_UCHAR((PUCHAR)0x70, address)); \ READ_PORT_UCHAR((PUCHAR)0x71)); \ @@ -63,20 +89,17 @@ WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ }) -#define BIOS_AREA 0x0 -#define COMMON_AREA 0x2000 +extern PVOID IMPORTED MmSystemRangeStart; +/* FUNCTIONS *********************************************************************/ -extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ +extern ULONG Read8254Timer(VOID); +extern VOID WaitFor8254Wraparound(VOID); +extern VOID MpsTimerInterrupt(VOID); +extern VOID MpsErrorInterrupt(VOID); +extern VOID MpsSpuriousInterrupt(VOID); +extern VOID MpsIpiInterrupt(VOID); -PULONG APICBase = (PULONG)APIC_DEFAULT_BASE; /* Virtual address of local APIC */ - -/* For debugging */ -ULONG lastregr[MAX_CPU]; -ULONG lastvalr[MAX_CPU]; -ULONG lastregw[MAX_CPU]; -ULONG lastvalw[MAX_CPU]; - ULONG APICGetMaxLVT(VOID) { ULONG tmp, ver, maxlvt; @@ -152,7 +175,7 @@ } /* Enable symetric I/O mode ie. connect the BSP's local APIC to INT and NMI lines */ -VOID EnableSMPMode(VOID) +VOID EnableApicMode(VOID) { /* * Do not trust the local APIC being empty at bootup. @@ -203,64 +226,7 @@ APICWrite(APIC_SIVR, tmp); } -VOID HaliInitBSP(VOID) -{ - PUSHORT ps; - static BOOLEAN BSPInitialized = FALSE; - /* Only initialize the BSP once */ - if (BSPInitialized) - { - KEBUGCHECK(0); - return; - } - - BSPInitialized = TRUE; - - DPRINT("APIC is mapped at 0x%X\n", APICBase); - - if (VerifyLocalAPIC()) - { - DPRINT("APIC found\n"); - } - else - { - DPRINT("No APIC found\n"); - KEBUGCHECK(0); - } - - if (APICMode == amPIC) - { - EnableSMPMode(); - } - - APICSetup(); - - /* BIOS data segment */ - BIOSBase = (PULONG)BIOS_AREA; - - /* Area for communicating with the APs */ - CommonBase = (PULONG)COMMON_AREA; - - /* Copy bootstrap code to common area */ - memcpy((PVOID)((ULONG)CommonBase + PAGE_SIZE), - &APstart, - (ULONG)&APend - (ULONG)&APstart + 1); - - /* Set shutdown code */ - CMOS_WRITE(0xF, 0xA); - - /* Set warm reset vector */ - ps = (PUSHORT)((ULONG)BIOSBase + 0x467); - *ps = (COMMON_AREA + PAGE_SIZE) & 0xF; - - ps = (PUSHORT)((ULONG)BIOSBase + 0x469); - *ps = (COMMON_AREA + PAGE_SIZE) >> 4; - - /* Calibrate APIC timer */ - APICCalibrateTimer(BootCPU); -} - inline ULONG _APICRead(ULONG Offset) { PULONG p; @@ -455,7 +421,6 @@ BOOLEAN VerifyLocalAPIC(VOID) { UINT reg0, reg1; - CHECKPOINT1; /* The version register is read-only in a real APIC */ reg0 = APICRead(APIC_VER); DPRINT1("Getting VERSION: %x\n", reg0); @@ -502,9 +467,23 @@ return FALSE; } + ULONG l, h; + Ki386Rdmsr(0x1b /*MSR_IA32_APICBASE*/, l, h); + + if (!(l & /*MSR_IA32_APICBASE_ENABLE*/(1<<11))) + { + DPRINT1("Local APIC disabled by BIOS -- reenabling.\n"); + l &= ~/*MSR_IA32_APICBASE_BASE*/(1<<11); + l |= /*MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE*/(1<<11)|0xfee00000; + Ki386Wrmsr(0x1b/*MSR_IA32_APICBASE*/, l, h); + } + + + return TRUE; } +#ifdef CONFIG_SMP VOID APICSendIPI(ULONG Target, ULONG Mode) { ULONG tmp, i, flags; @@ -568,6 +547,7 @@ } Ki386RestoreFlags(flags); } +#endif VOID APICSetup(VOID) { @@ -651,7 +631,6 @@ } APICWrite(APIC_LINT0, tmp); - /* [truncated at 1000 lines; 7233 more skipped]

19 years, 9 months

← Newer
1
...
47
48
49
50
51
52
53
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005