Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 29666: Allow selecting monitors using the keyboard
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 03:39:16 2007 New Revision: 29666 URL: http://svn.reactos.org/svn/reactos?rev=29666&view=rev Log: Allow selecting monitors using the keyboard Modified: trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/desk/monslctl.h Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Fri Oct 19 03:39:16 2007 @@ -626,7 +626,7 @@ infoPtr->SelectedMonitor = -1; infoPtr->DraggingMonitor = -1; infoPtr->ControlExStyle = MSLM_EX_ALLOWSELECTDISABLED | MSLM_EX_HIDENUMBERONSINGLE | - MSLM_EX_SELECTONRIGHTCLICK; + MSLM_EX_SELECTONRIGHTCLICK | MSLM_EX_SELECTBYARROWKEY; return; } @@ -1251,6 +1251,9 @@ INT Index; POINT pt; + if (!infoPtr->HasFocus) + SetFocus(infoPtr->hSelf); + pt.x = (LONG)LOWORD(lParam); pt.y = (LONG)HIWORD(lParam); @@ -1317,6 +1320,9 @@ } Ret |= DLGC_WANTARROWS; + + if (infoPtr->ControlExStyle & MSLM_EX_SELECTBYNUMKEY) + Ret |= DLGC_WANTCHARS; break; } @@ -1400,6 +1406,78 @@ if (OldEnabled != infoPtr->Enabled) MonSelRepaint(infoPtr); + } + break; + } + + case WM_KEYDOWN: + { + INT Index; + + if (infoPtr->ControlExStyle & MSLM_EX_SELECTBYARROWKEY) + { + switch (wParam) + { + case VK_UP: + case VK_LEFT: + { + Index = infoPtr->SelectedMonitor; + + if (infoPtr->MonitorsCount != 0) + { + if (Index < 0) + Index = 0; + else if (Index > 0) + Index--; + } + + if (Index >= 0) + { + MonSelSetCurSelMonitor(infoPtr, + Index, + TRUE); + } + break; + } + + case VK_DOWN: + case VK_RIGHT: + { + Index = infoPtr->SelectedMonitor; + + if (infoPtr->MonitorsCount != 0) + { + if (Index < 0) + Index = (INT)infoPtr->MonitorsCount - 1; + else if (Index < (INT)infoPtr->MonitorsCount - 1) + Index++; + } + + if (infoPtr->SelectedMonitor < infoPtr->MonitorsCount) + { + MonSelSetCurSelMonitor(infoPtr, + Index, + TRUE); + } + break; + } + } + } + break; + } + + case WM_CHAR: + { + if ((infoPtr->ControlExStyle & MSLM_EX_SELECTBYNUMKEY) && + wParam >= '1' && wParam <= '9') + { + INT Index = (INT)(wParam - '1'); + if (Index < (INT)infoPtr->MonitorsCount) + { + MonSelSetCurSelMonitor(infoPtr, + Index, + TRUE); + } } break; } Modified: trunk/reactos/dll/cpl/desk/monslctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.h (original) +++ trunk/reactos/dll/cpl/desk/monslctl.h Fri Oct 19 03:39:16 2007 @@ -7,6 +7,8 @@ #define MSLM_EX_HIDENUMBERONSINGLE 0x4 #define MSLM_EX_HIDENUMBERS 0x8 #define MSLM_EX_SELECTONRIGHTCLICK 0x10 +#define MSLM_EX_SELECTBYNUMKEY 0x20 +#define MSLM_EX_SELECTBYARROWKEY 0x40 /* MONSL_MONINFO Flags */ #define MSL_MIF_DISABLED 0x1 @@ -177,6 +179,11 @@ * * MSLM_EX_SELECTONRIGHTCLICK * Selects a monitor when the user right clicks * on it. + * * MSLM_EX_SELECTBYNUMKEY + * Allows selecting a monitor by using the keys + * '1' to '9'. + * * MSLM_EX_SELECTBYARROWKEY + * Allows selecting a monitor using the arrow keys. * * Returns non-zero value if successful. */

1 0

[weiden] 29665: Add very basic dragging support to the monitor selection control
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 02:59:33 2007 New Revision: 29665 URL: http://svn.reactos.org/svn/reactos?rev=29665&view=rev Log: Add very basic dragging support to the monitor selection control Modified: trunk/reactos/dll/cpl/desk/monslctl.c Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Fri Oct 19 02:59:33 2007 @@ -27,11 +27,17 @@ UINT Enabled : 1; UINT HasFocus : 1; UINT CanDisplay : 1; + UINT LeftBtnDown : 1; + UINT IsDraggingMonitor : 1; }; }; DWORD ControlExStyle; DWORD MonitorsCount; INT SelectedMonitor; + INT DraggingMonitor; + RECT rcDragging; + POINT ptDrag, ptDragBegin; + SIZE DraggingMargin; PMONSL_MONINFO MonitorInfo; PMONSL_MON Monitors; RECT rcExtent; @@ -265,15 +271,34 @@ IN DWORD Index) { RECT rc; + BOOL NoRepaint = FALSE; if (Index < infoPtr->MonitorsCount) { - MonSelRectToScreen(infoPtr, - &infoPtr->Monitors[Index].rc, - &rc); - InvalidateRect(infoPtr->hSelf, - &rc, - TRUE); + if (Index == (DWORD)infoPtr->DraggingMonitor) + { + if (infoPtr->IsDraggingMonitor) + { + MonSelRectToScreen(infoPtr, + &infoPtr->rcDragging, + &rc); + } + else + NoRepaint = TRUE; + } + else + { + MonSelRectToScreen(infoPtr, + &infoPtr->Monitors[Index].rc, + &rc); + } + + if (!NoRepaint) + { + InvalidateRect(infoPtr->hSelf, + &rc, + TRUE); + } } } @@ -369,6 +394,9 @@ { DWORD Index; BOOL Ret = TRUE; + + if (infoPtr->DraggingMonitor >= 0) + return FALSE; if (infoPtr->MonitorInfo != NULL) { @@ -466,7 +494,8 @@ IN INT Index, IN const MONSL_MONINFO *MonitorsInfo) { - if (Index >= 0 && Index < (INT)infoPtr->MonitorsCount) + if (infoPtr->DraggingMonitor < 0 && + Index >= 0 && Index < (INT)infoPtr->MonitorsCount) { CopyMemory(&infoPtr->MonitorInfo[Index], MonitorsInfo, @@ -531,7 +560,8 @@ BOOL PreventSelect = FALSE; BOOL Ret = FALSE; - if (Index == -1 || Index < (INT)infoPtr->MonitorsCount) + if (infoPtr->DraggingMonitor < 0 && + (Index == -1 || Index < (INT)infoPtr->MonitorsCount)) { if (Index != infoPtr->SelectedMonitor) { @@ -594,6 +624,7 @@ infoPtr->SelectionFrame.cx = infoPtr->SelectionFrame.cy = 4; infoPtr->Margin.cx = infoPtr->Margin.cy = 20; infoPtr->SelectedMonitor = -1; + infoPtr->DraggingMonitor = -1; infoPtr->ControlExStyle = MSLM_EX_ALLOWSELECTDISABLED | MSLM_EX_HIDENUMBERONSINGLE | MSLM_EX_SELECTONRIGHTCLICK; return; @@ -624,6 +655,9 @@ MonSelSetExtendedStyle(IN OUT PMONITORSELWND infoPtr, IN DWORD dwExtendedStyle) { + if (infoPtr->DraggingMonitor >= 0) + return FALSE; + if (dwExtendedStyle != infoPtr->ControlExStyle) { infoPtr->ControlExStyle = dwExtendedStyle; @@ -725,12 +759,91 @@ } static VOID +MonSelPaintMonitor(IN OUT PMONITORSELWND infoPtr, + IN HDC hDC, + IN DWORD Index, + IN OUT PRECT prc, + IN COLORREF crDefFontColor, + IN BOOL bHideNumber) +{ + HFONT hFont, hPrevFont; + COLORREF crPrevText; + + if ((INT)Index == infoPtr->SelectedMonitor) + { + FillRect(hDC, + prc, + (HBRUSH)(COLOR_HIGHLIGHT + 1)); + + if (infoPtr->HasFocus && !(infoPtr->UIState & UISF_HIDEFOCUS)) + { + /* NOTE: We need to switch the text color to the default, because + DrawFocusRect draws a solid line if the text is white! */ + + crPrevText = SetTextColor(hDC, + crDefFontColor); + + DrawFocusRect(hDC, + prc); + + SetTextColor(hDC, + crPrevText); + } + } + + InflateRect(prc, + -infoPtr->SelectionFrame.cx, + -infoPtr->SelectionFrame.cy); + + Rectangle(hDC, + prc->left, + prc->top, + prc->right, + prc->bottom); + + InflateRect(prc, + -1, + -1); + + if (!bHideNumber) + { + hFont = MonSelGetMonitorFont(infoPtr, + hDC, + Index); + if (hFont != NULL) + { + hPrevFont = SelectObject(hDC, + hFont); + + DrawText(hDC, + infoPtr->Monitors[Index].szCaption, + -1, + prc, + DT_VCENTER | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + + SelectObject(hDC, + hPrevFont); + } + } + + if (infoPtr->MonitorInfo[Index].Flags & MSL_MIF_DISABLED) + { + InflateRect(prc, + 1, + 1); + + MonSelDrawDisabledRect(infoPtr, + hDC, + prc); + } +} + +static VOID MonSelPaint(IN OUT PMONITORSELWND infoPtr, IN HDC hDC, IN const RECT *prcUpdate) { - COLORREF crPrevText, crPrevText2; - HFONT hFont, hPrevFont; + COLORREF crPrevText; HBRUSH hbBk, hbOldBk; HPEN hpFg, hpOldFg; DWORD Index; @@ -757,83 +870,47 @@ for (Index = 0; Index < infoPtr->MonitorsCount; Index++) { + if (infoPtr->IsDraggingMonitor && + (DWORD)infoPtr->DraggingMonitor == Index) + { + continue; + } + MonSelRectToScreen(infoPtr, &infoPtr->Monitors[Index].rc, &rc); - if (!IntersectRect(&rctmp, - &rc, - prcUpdate)) - { - continue; - } - - if ((INT)Index == infoPtr->SelectedMonitor) - { - FillRect(hDC, - &rc, - (HBRUSH)(COLOR_HIGHLIGHT + 1)); - - if (infoPtr->HasFocus && !(infoPtr->UIState & UISF_HIDEFOCUS)) - { - /* NOTE: We need to switch the text color to the default, because - DrawFocusRect draws a solid line if the text is white! */ - - crPrevText2 = SetTextColor(hDC, - crPrevText); - - DrawFocusRect(hDC, - &rc); - - SetTextColor(hDC, - crPrevText2); - } - } - - InflateRect(&rc, - -infoPtr->SelectionFrame.cx, - -infoPtr->SelectionFrame.cy); - - Rectangle(hDC, - rc.left, - rc.top, - rc.right, - rc.bottom); - - InflateRect(&rc, - -1, - -1); - - if (!bHideNumber) - { - hFont = MonSelGetMonitorFont(infoPtr, - hDC, - Index); - if (hFont != NULL) - { - hPrevFont = SelectObject(hDC, - hFont); - - DrawText(hDC, - infoPtr->Monitors[Index].szCaption, - -1, - &rc, - DT_VCENTER | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); - - SelectObject(hDC, - hPrevFont); - } - } - - if (infoPtr->MonitorInfo[Index].Flags & MSL_MIF_DISABLED) - { - InflateRect(&rc, - 1, - 1); - - MonSelDrawDisabledRect(infoPtr, - hDC, - &rc); + if (IntersectRect(&rctmp, + &rc, + prcUpdate)) + { + MonSelPaintMonitor(infoPtr, + hDC, + Index, + &rc, + crPrevText, + bHideNumber); + } + } + + /* Paint the dragging monitor last */ + if (infoPtr->IsDraggingMonitor && + (DWORD)infoPtr->DraggingMonitor >= 0) + { + MonSelRectToScreen(infoPtr, + &infoPtr->rcDragging, + &rc); + + if (IntersectRect(&rctmp, + &rc, + prcUpdate)) + { + MonSelPaintMonitor(infoPtr, + hDC, + (DWORD)infoPtr->DraggingMonitor, + &rc, + crPrevText, + bHideNumber); } } @@ -882,6 +959,202 @@ nm.pt.y)); } +static VOID +MonSelApplyCursorClipping(IN PMONITORSELWND infoPtr, + IN BOOL bClip) +{ + RECT rc; + + if (bClip) + { + rc.left = rc.top = 0; + rc.right = infoPtr->ClientSize.cx; + rc.bottom = infoPtr->ClientSize.cy; + + if (MapWindowPoints(infoPtr->hSelf, + NULL, + (LPPOINT)&rc, + 2)) + { + ClipCursor(&rc); + } + } + else + { + ClipCursor(NULL); + } +} + +static VOID +MonSelMoveDragRect(IN OUT PMONITORSELWND infoPtr, + IN PPOINT ppt) +{ + RECT rcPrev, rcUpdate, *prc; + HRGN hRgnPrev; + HDC hDC; + + if (infoPtr->CanDisplay) + { + hDC = GetDC(infoPtr->hSelf); + if (hDC != NULL) + { + if (infoPtr->ptDrag.x != ppt->x || + infoPtr->ptDrag.y != ppt->y) + { + infoPtr->ptDrag = *ppt; + + rcPrev = infoPtr->rcDragging; + + /* Calculate updated dragging rectangle */ + prc = &infoPtr->Monitors[infoPtr->DraggingMonitor].rc; + infoPtr->rcDragging.left = ppt->x - infoPtr->DraggingMargin.cx; + infoPtr->rcDragging.top = ppt->y - infoPtr->DraggingMargin.cy; + infoPtr->rcDragging.right = infoPtr->rcDragging.left + (prc->right - prc->left); + infoPtr->rcDragging.bottom = infoPtr->rcDragging.top + (prc->bottom - prc->top); + + hRgnPrev = CreateRectRgn(rcPrev.left, + rcPrev.top, + rcPrev.right, + rcPrev.bottom); + + if (hRgnPrev != NULL) + { + if (!ScrollDC(hDC, + infoPtr->rcDragging.left - rcPrev.left, + infoPtr->rcDragging.top - rcPrev.top, + &rcPrev, + NULL, + hRgnPrev, + &rcUpdate) || + !InvalidateRgn(infoPtr->hSelf, + hRgnPrev, + TRUE)) + { + DeleteObject(hRgnPrev); + goto InvRects; + } + + DeleteObject(hRgnPrev); + } + else + { +InvRects: + InvalidateRect(infoPtr->hSelf, + &rcPrev, + TRUE); + InvalidateRect(infoPtr->hSelf, + &infoPtr->rcDragging, + TRUE); + } + } + + ReleaseDC(infoPtr->hSelf, + hDC); + } + } +} + +static VOID +MonSelCancelDragging(IN OUT PMONITORSELWND infoPtr) +{ + DWORD Index; + + if (infoPtr->DraggingMonitor >= 0) + { + MonSelMoveDragRect(infoPtr, + &infoPtr->ptDragBegin); + + Index = (DWORD)infoPtr->DraggingMonitor; + infoPtr->DraggingMonitor = -1; + + if (infoPtr->CanDisplay) + { + /* Repaint the area where the monitor was last dragged */ + MonSelRepaintMonitor(infoPtr, + Index); + + infoPtr->IsDraggingMonitor = FALSE; + + /* Repaint the area where the monitor is located */ + MonSelRepaintMonitor(infoPtr, + Index); + } + else + infoPtr->IsDraggingMonitor = FALSE; + + ReleaseCapture(); + + MonSelApplyCursorClipping(infoPtr, + FALSE); + } +} + +static VOID +MonSelInitDragging(IN OUT PMONITORSELWND infoPtr, + IN DWORD Index, + IN PPOINT ppt) +{ + POINT pt; + + MonSelCancelDragging(infoPtr); + infoPtr->IsDraggingMonitor = FALSE; + + MonSelScreenToPt(infoPtr, + ppt, + &pt); + + infoPtr->ptDrag = infoPtr->ptDragBegin = pt; + infoPtr->DraggingMonitor = (INT)Index; + + infoPtr->DraggingMargin.cx = ppt->x - infoPtr->Monitors[Index].rc.left; + infoPtr->DraggingMargin.cy = ppt->y - infoPtr->Monitors[Index].rc.top; + infoPtr->rcDragging = infoPtr->Monitors[Index].rc; + + MonSelApplyCursorClipping(infoPtr, + TRUE); +} + +static VOID +MonSelDrag(IN OUT PMONITORSELWND infoPtr, + IN PPOINT ppt) +{ + SIZE szDrag; + POINT pt; + RECT rcDrag; + + if (infoPtr->DraggingMonitor >= 0) + { + MonSelScreenToPt(infoPtr, + ppt, + &pt); + + if (!infoPtr->IsDraggingMonitor) + { + szDrag.cx = GetSystemMetrics(SM_CXDRAG); + szDrag.cy = GetSystemMetrics(SM_CYDRAG); + + rcDrag.left = infoPtr->Monitors[infoPtr->DraggingMonitor].rc.left + infoPtr->DraggingMargin.cx - (szDrag.cx / 2); + rcDrag.top = infoPtr->Monitors[infoPtr->DraggingMonitor].rc.top + infoPtr->DraggingMargin.cy - (szDrag.cy / 2); + rcDrag.right = rcDrag.left + szDrag.cx; + rcDrag.bottom = rcDrag.top + szDrag.cy; + + if (!PtInRect(&rcDrag, + pt)) + { + /* The user started moving around the mouse: Begin dragging */ + infoPtr->IsDraggingMonitor = TRUE; + MonSelMoveDragRect(infoPtr, + &pt); + } + } + else + { + MonSelMoveDragRect(infoPtr, + &pt); + } + } +} + static LRESULT CALLBACK MonitorSelWndProc(IN HWND hwnd, IN UINT uMsg, @@ -942,6 +1215,28 @@ break; } + case WM_MOUSEMOVE: + { + POINT pt; + + if (!(wParam & MK_LBUTTON)) + { + MonSelCancelDragging(infoPtr); + break; + } + + if (infoPtr->LeftBtnDown) + { + pt.x = (LONG)LOWORD(lParam); + pt.y = (LONG)HIWORD(lParam); + + MonSelDrag(infoPtr, + &pt); + } + + break; + } + case WM_RBUTTONDOWN: { if (!(infoPtr->ControlExStyle & MSLM_EX_SELECTONRIGHTCLICK)) @@ -968,6 +1263,14 @@ TRUE); } + if (Index >= 0 && (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONDBLCLK)) + { + infoPtr->LeftBtnDown = TRUE; + MonSelInitDragging(infoPtr, + (DWORD)Index, + &pt); + } + /* fall through */ } @@ -983,6 +1286,13 @@ MonSelContextMenu(infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + break; + } + + case WM_LBUTTONUP: + { + MonSelCancelDragging(infoPtr); + infoPtr->LeftBtnDown = FALSE; break; } @@ -1020,6 +1330,7 @@ case WM_KILLFOCUS: { infoPtr->HasFocus = FALSE; + MonSelCancelDragging(infoPtr); MonSelRepaintSelected(infoPtr); break; }

1 0

[cfinck] 29664: Use StretchBlt with fixed values for drawing the card backs in the Deck Options dialog. This way the dialog looks normally, also with bigger cards like the Bavarian ones.
by cfinck＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: cfinck Date: Fri Oct 19 02:04:50 2007 New Revision: 29664 URL: http://svn.reactos.org/svn/reactos?rev=29664&view=rev Log: Use StretchBlt with fixed values for drawing the card backs in the Deck Options dialog. This way the dialog looks normally, also with bigger cards like the Bavarian ones. Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Oct 19 02:04:50 2007 @@ -323,15 +323,17 @@ rc.right, rc.bottom); - BitBlt(hdc, - 2, - 2, - __cardwidth, - __cardheight, - __hdcCardBitmaps, - pCardBack->hdcNum * __cardwidth, - 0, - SRCCOPY); + StretchBlt(hdc, + 2, + 2, + CARDBACK_OPTIONS_WIDTH, + CARDBACK_OPTIONS_HEIGHT, + __hdcCardBitmaps, + pCardBack->hdcNum * __cardwidth, + 0, + __cardwidth, + __cardheight, + SRCCOPY); SelectObject(hdc, hOldPen); SelectObject(hdc, hOldBrush); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Fri Oct 19 02:04:50 2007 @@ -5,12 +5,14 @@ extern TCHAR szAppName[]; extern bool fGameStarted; -#define OPTION_SHOW_STATUS 4 -#define OPTION_THREE_CARDS 8 -#define CARDBACK_START IDC_CARDBACK1 -#define CARDBACK_END IDC_CARDBACK4 -#define NUM_CARDBACKS (CARDBACK_END - CARDBACK_START + 1) -#define CARDBACK_RES_START 53 +#define OPTION_SHOW_STATUS 4 +#define OPTION_THREE_CARDS 8 +#define CARDBACK_START IDC_CARDBACK1 +#define CARDBACK_END IDC_CARDBACK4 +#define NUM_CARDBACKS (CARDBACK_END - CARDBACK_START + 1) +#define CARDBACK_RES_START 53 +#define CARDBACK_OPTIONS_WIDTH 72 +#define CARDBACK_OPTIONS_HEIGHT 96 extern DWORD dwOptions;

1 0

[cfinck] 29663: - Fix a bug in Solitaire: When you used the 1-card-mode before, there never was a card behind the one, which you drag from the pile. Now Solitaire collects all the cards from the deck in the 1-card-mode like Windows Solitaire does. - Make it possible to use CS_EI_CIRC (the O sign) and CS_EI_X (the X sign) as empty images for a deck. Actually make use of CS_EI_CIRC for the Solitaire deck.
by cfinck＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: cfinck Date: Fri Oct 19 01:54:39 2007 New Revision: 29663 URL: http://svn.reactos.org/svn/reactos?rev=29663&view=rev Log: - Fix a bug in Solitaire: When you used the 1-card-mode before, there never was a card behind the one, which you drag from the pile. Now Solitaire collects all the cards from the deck in the 1-card-mode like Windows Solitaire does. - Make it possible to use CS_EI_CIRC (the O sign) and CS_EI_X (the X sign) as empty images for a deck. Actually make use of CS_EI_CIRC for the Solitaire deck. Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp trunk/reactos/base/applications/games/solitaire/solcreate.cpp trunk/reactos/base/applications/games/solitaire/solgame.cpp Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h Fri Oct 19 01:54:39 2007 @@ -8,14 +8,13 @@ #define CS_EI_NONE 0 #define CS_EI_SUNK 1 +#define CS_EI_CIRC 67 +#define CS_EI_X 66 #define CS_DEFXOFF 12 //x-offset #define CS_DEFYOFF 18 //y-offset #define CS_NO3D 1 //default 3d counts (recommened) #define CS_DEF3D 10 //(best for decks) - -//#define CS_EI_CIRC 2 -//#define CS_EI_X 3 #define CS_DRAG_NONE 0 #define CS_DRAG_TOP 1 Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp Fri Oct 19 01:54:39 2007 @@ -365,7 +365,10 @@ { switch(uImage) { - case CS_EI_NONE: case CS_EI_SUNK: + case CS_EI_NONE: + case CS_EI_SUNK: + case CS_EI_CIRC: + case CS_EI_X: uEmptyImage = uImage; break; Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp Fri Oct 19 01:54:39 2007 @@ -347,15 +347,21 @@ switch(uEmptyImage) { - default: case CS_EI_NONE: + default: + case CS_EI_NONE: //this wipes the RECT variable, so watch out! //SetRect(&rect, x, y, x+__cardwidth, y+__cardheight); //PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd)); parentWnd.PaintCardRgn(hdc, x, y, __cardwidth, __cardheight, x, y); break; - case CS_EI_SUNK: //case CS_EI_CIRC: case CS_EI_X: + case CS_EI_SUNK: DrawCard(hdc, x, y, __hdcPlaceHolder, __cardwidth, __cardheight); + break; + + case CS_EI_CIRC: + case CS_EI_X: + CardBlt(hdc, x, y, uEmptyImage); break; } @@ -466,6 +472,11 @@ case CS_EI_SUNK: DrawCard(hdcBackGnd, xoff, yoff, __hdcPlaceHolder, __cardwidth, __cardheight); break; + + case CS_EI_CIRC: + case CS_EI_X: + CardBlt(hdc, xoff, yoff, uEmptyImage); + break; } } @@ -559,7 +570,7 @@ // // If there are no cards under this one, just draw the place holder // - if(numcards == 0) + if(numcards == 0) { switch(uEmptyImage) { @@ -573,7 +584,11 @@ case CS_EI_SUNK: DrawCard(hdcBackGnd, 0, 0, __hdcPlaceHolder, __cardwidth, __cardheight); break; - + + case CS_EI_CIRC: + case CS_EI_X: + CardBlt(hdc, 0, 0, uEmptyImage); + break; } } Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solcreate.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp Fri Oct 19 01:54:39 2007 @@ -30,7 +30,7 @@ yRowStackCardOffset = (int)(__cardheight / 6.7); pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1); - pDeck->SetEmptyImage(CS_EI_SUNK); + pDeck->SetEmptyImage(CS_EI_CIRC); pDeck->SetThreedCount(6); pDeck->SetDragRule(CS_DRAG_NONE, 0); pDeck->SetDropRule(CS_DROP_NONE, 0); Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Fri Oct 19 01:54:39 2007 @@ -50,7 +50,11 @@ //put the other cards onto the deck pDeck->SetCardStack(deck); pDeck->Update(); - + + // For the 1-card-mode, all cards need to be completely overlapped + if(!(dwOptions & OPTION_THREE_CARDS)) + pPile->SetOffsets(0, 0); + SolWnd.Redraw(); fGameStarted = false; @@ -331,7 +335,8 @@ fGameStarted = true; //reset the face-up pile to represent 3 cards - pPile->SetOffsets(CS_DEFXOFF, 1); + if(dwOptions & OPTION_THREE_CARDS) + pPile->SetOffsets(CS_DEFXOFF, 1); if(cardstack.NumCards() == 0) { @@ -350,7 +355,9 @@ temp = cardstack.Pop(numcards); temp.Reverse(); - pile.Clear(); + if(dwOptions & OPTION_THREE_CARDS) + pile.Clear(); + pile.Push(temp); //remove the top 3 from deck

1 0

[janderwald] 29662: - only register hotkey when setup is active - should fix bug 2684 See issue #2684 for more details.
by janderwald＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: janderwald Date: Fri Oct 19 01:09:45 2007 New Revision: 29662 URL: http://svn.reactos.org/svn/reactos?rev=29662&view=rev Log: - only register hotkey when setup is active - should fix bug 2684 See issue #2684 for more details. Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Fri Oct 19 01:09:45 2007 @@ -873,13 +873,14 @@ /* Save the Session pointer */ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)Session); - if (GetSetupType() == 0) + if (GetSetupType()) return TRUE; return RegisterHotKeys(Session, hwndDlg); } case WM_DESTROY: { - UnregisterHotKeys(Session, hwndDlg); + if (!GetSetupType()) + UnregisterHotKeys(Session, hwndDlg); return TRUE; } case WM_SETTINGCHANGE:

1 0

[mnordell] 29661: Fix logical error in a hack.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 19:37:52 2007 New Revision: 29661 URL: http://svn.reactos.org/svn/reactos?rev=29661&view=rev Log: Fix logical error in a hack. Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c (original) +++ trunk/reactos/drivers/bus/pci/fdo.c Thu Oct 18 19:37:52 2007 @@ -369,7 +369,8 @@ AllocatedResources = IoGetCurrentIrpStackLocation(Irp)->Parameters.StartDevice.AllocatedResources; /* HACK due to a bug in ACPI driver, which doesn't report the bus number */ - if (!FoundBuggyAllocatedResourcesList || !AllocatedResources || AllocatedResources->Count == 0) + if (!FoundBuggyAllocatedResourcesList && + (!AllocatedResources || AllocatedResources->Count == 0)) { FoundBuggyAllocatedResourcesList = TRUE; DPRINT1("No bus number resource found (bug in acpi.sys?), assuming bus number #0\n");

1 0

[tkreuzer] 29660: revert my useless hack.
by tkreuzer＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: tkreuzer Date: Thu Oct 18 13:44:58 2007 New Revision: 29660 URL: http://svn.reactos.org/svn/reactos?rev=29660&view=rev Log: revert my useless hack. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Oct 18 13:44:58 2007 @@ -1603,53 +1603,6 @@ } #endif -void -InitTitle() -{ - STARTUPINFOW StartupInfo; - LPWSTR lpFileName; - WCHAR szTitle[MAX_PATH+1]; - - GetStartupInfoW(&StartupInfo); - - if (StartupInfo.lpTitle) - { - /* Are we started from a shortcut? */ - if (StartupInfo.dwFlags & 0x800) - { - UINT len; - - /* We are started from a shortcut, use the file name only */ - lpFileName = wcsrchr(StartupInfo.lpTitle, '\\'); - if (lpFileName == NULL) - { - lpFileName = StartupInfo.lpTitle; - } - - /* Drop file extension, we simply assume 3 chars extension */ - len = wcslen(lpFileName) - 4; - if (len > 0) - { - len = min(len, MAX_PATH); - wcsncpy(szTitle, lpFileName, len); - szTitle[len] = 0; - SetConsoleTitleW(szTitle); - return; - } - } - - /* Use lpTitle member of STARTUPINFO */ - SetConsoleTitleW(StartupInfo.lpTitle); - return; - } - - /* Set executable path as window title */ - GetModuleFileNameW(NULL, szTitle, MAX_PATH); - SetConsoleTitleW(szTitle); - return; -} - - /* * set up global initializations and process parameters * @@ -1672,11 +1625,6 @@ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx (&osvi); - /* FIXME: Doesn't work in ros yet, because of missing functionality of ShellExecute. - See bug 2743. Please unif as soon as it get's fixed. */ -#if 0 - InitTitle(); -#endif /* Some people like to run ReactOS cmd.exe on Win98, it helps in the * build process. So don't link implicitly against ntdll.dll, load it * dynamically instead */

1 0

[hpoussin] 29659: Export GetDefaultPrinterA/W also by ordinal
by hpoussin＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: hpoussin Date: Thu Oct 18 12:44:46 2007 New Revision: 29659 URL: http://svn.reactos.org/svn/reactos?rev=29659&view=rev Log: Export GetDefaultPrinterA/W also by ordinal Modified: trunk/reactos/dll/win32/winspool/winspool.def Modified: trunk/reactos/dll/win32/winspool/winspool.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.def (original) +++ trunk/reactos/dll/win32/winspool/winspool.def Thu Oct 18 12:44:46 2007 @@ -76,8 +76,8 @@ FindFirstPrinterChangeNotification@16 FindNextPrinterChangeNotification@16 FreePrinterNotifyInfo@4 -GetDefaultPrinterA@8 -GetDefaultPrinterW@8 +GetDefaultPrinterA@8 @201 +GetDefaultPrinterW@8 @203 GetFormA@24 GetFormW@24 GetJobA@24

1 0

[arty] 29658: Break in at will. Fix trap handler a bit, allowing setting of MSR. Make packet code work properly when serial output is interrupted by a packet from gdb.
by arty＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: arty Date: Thu Oct 18 12:12:28 2007 New Revision: 29658 URL: http://svn.reactos.org/svn/reactos?rev=29658&view=rev Log: Break in at will. Fix trap handler a bit, allowing setting of MSR. Make packet code work properly when serial output is interrupted by a packet from gdb. Modified: trunk/reactos/lib/ppcmmu/devint.s trunk/reactos/lib/ppcmmu/gdblib.c trunk/reactos/lib/ppcmmu/mmuobject.c Modified: trunk/reactos/lib/ppcmmu/devint.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/devint.s?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/devint.s (original) +++ trunk/reactos/lib/ppcmmu/devint.s Thu Oct 18 12:12:28 2007 @@ -5,61 +5,60 @@ mmumain: mr 0,1 lis 1,2 - subi 1,1,432 - stw 0,4(1) - stw 2,8(1) - stw 3,12(1) - stw 4,16(1) - stw 5,20(1) - stw 6,24(1) - stw 7,28(1) - stw 8,32(1) - stw 9,36(1) - stw 10,40(1) - stw 11,44(1) - stw 12,48(1) - stw 13,52(1) - stw 14,56(1) - stw 15,60(1) - stw 16,64(1) - stw 17,68(1) - stw 18,72(1) - stw 19,76(1) - stw 20,80(1) - stw 21,84(1) - stw 22,88(1) - stw 23,92(1) - stw 24,96(1) - stw 25,100(1) - stw 26,104(1) - stw 27,108(1) - stw 28,112(1) - stw 29,116(1) - stw 30,120(1) - stw 31,124(1) + subi 1,1,448 + stw 0,20(1) + stw 2,24(1) + stw 3,28(1) + stw 4,32(1) + stw 5,36(1) + stw 6,40(1) + stw 7,44(1) + stw 8,48(1) + stw 9,52(1) + stw 10,56(1) + stw 11,60(1) + stw 12,64(1) + stw 13,68(1) + stw 14,72(1) + stw 15,76(1) + stw 16,80(1) + stw 17,84(1) + stw 18,88(1) + stw 19,92(1) + stw 20,96(1) + stw 21,100(1) + stw 22,104(1) + stw 23,108(1) + stw 24,112(1) + stw 25,116(1) + stw 26,120(1) + stw 27,124(1) + stw 28,128(1) + stw 29,132(1) + stw 30,136(1) + stw 31,140(1) + mfsrr0 0 + stw 0,400(1) + mfmsr 0 + stw 0,404(1) + mfcr 0 + stw 0,408(1) mflr 0 - stw 0,384(1) - mfmsr 0 - stw 0,388(1) - mfcr 0 - stw 0,392(1) - mflr 0 - stw 0,396(1) + stw 0,412(1) mfctr 0 - stw 0,400(1) + stw 0,416(1) mfxer 0 - stw 0,404(1) - xor 0,0,0 - stw 0,408(1) + stw 0,420(1) + /* xor 0,0,0 -- We can omit this since PPC doesn't have MQ */ + stw 0,424(1) mfdsisr 0 - stw 0,412(1) + stw 0,428(1) mfdar 0 - stw 0,416(1) - mr 7,1 + stw 0,432(1) + addi 7,1,16 lis 8,_mmumain@ha addi 8,8,_mmumain@l mtctr 8 - subi 1,1,16 bctrl addi 1,1,16 lwz 2,8(1) @@ -98,7 +97,9 @@ mtlr 0 lwz 0,400(1) mtctr 0 + lwz 0,388(1) /* Copy out new MSR bits if needed */ lwz 1,4(1) + mtmsr 0 blr .globl trap_start @@ -106,68 +107,67 @@ trap_start: mtsprg1 1 lis 1,2 - subi 1,1,432 - stw 0,0(1) + subi 1,1,448 + stw 0,16(1) mfsprg1 0 - stw 0,4(1) - stw 2,8(1) - stw 3,12(1) - stw 4,16(1) - stw 5,20(1) - stw 6,24(1) - stw 7,28(1) - stw 8,32(1) - stw 9,36(1) - stw 10,40(1) - stw 11,44(1) - stw 12,48(1) - stw 13,52(1) - stw 14,56(1) - stw 15,60(1) - stw 16,64(1) - stw 17,68(1) - stw 18,72(1) - stw 19,76(1) - stw 20,80(1) - stw 21,84(1) - stw 22,88(1) - stw 23,92(1) - stw 24,96(1) - stw 25,100(1) - stw 26,104(1) - stw 27,108(1) - stw 28,112(1) - stw 29,116(1) - stw 30,120(1) - stw 31,124(1) + stw 0,20(1) + stw 2,24(1) + stw 3,28(1) + stw 4,32(1) + stw 5,36(1) + stw 6,40(1) + stw 7,44(1) + stw 8,48(1) + stw 9,52(1) + stw 10,56(1) + stw 11,60(1) + stw 12,64(1) + stw 13,68(1) + stw 14,72(1) + stw 15,76(1) + stw 16,80(1) + stw 17,84(1) + stw 18,88(1) + stw 19,92(1) + stw 20,96(1) + stw 21,100(1) + stw 22,104(1) + stw 23,108(1) + stw 24,112(1) + stw 25,116(1) + stw 26,120(1) + stw 27,124(1) + stw 28,128(1) + stw 29,132(1) + stw 30,136(1) + stw 31,140(1) mfsrr0 0 - stw 0,384(1) + stw 0,400(1) mfsrr1 0 - stw 0,388(1) + stw 0,404(1) mfcr 0 - stw 0,392(1) + stw 0,408(1) mflr 0 - stw 0,396(1) + stw 0,412(1) mfctr 0 - stw 0,400(1) + stw 0,416(1) mfxer 0 - stw 0,404(1) - xor 0,0,0 - stw 0,408(1) + stw 0,420(1) + /* xor 0,0,0 -- We can omit this since PPC doesn't have MQ */ + stw 0,424(1) mfdsisr 0 - stw 0,412(1) + stw 0,428(1) mfdar 0 - stw 0,416(1) + stw 0,432(1) bl 1f 1: mflr 5 - mr 4,1 + addi 4,1,16 rlwinm 3,5,24,0xff lwz 5,36(5) mtctr 5 lis 5,trap_finish_start@ha addi 5,5,trap_finish_start@l mtlr 5 - subi 1,1,16 bctr trap_end: .space 4 Modified: trunk/reactos/lib/ppcmmu/gdblib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/gdblib.c?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/gdblib.c (original) +++ trunk/reactos/lib/ppcmmu/gdblib.c Thu Oct 18 12:12:28 2007 @@ -31,6 +31,7 @@ * * Modified for 386 by Jim Kingdon, Cygnus Support. * Modified for ReactOS by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * Modified heavily for PowerPC ReactOS by arty * * To enable debugger support, two things need to happen. One, setting * up a routine so that it is in the exception path, is necessary in order @@ -127,12 +128,12 @@ (ch >= '0' && ch <= '9'); } -void sync() { +inline void sync() { __asm__("eieio\n\t" "sync"); } -void send(char *serport, char c) { +inline void send(char *serport, char c) { /* Wait for Clear to Send */ while( !(serport[LSR] & 0x20) ) sync(); @@ -140,16 +141,22 @@ sync(); } -int rdy(char *serport) +inline int rdy(char *serport) { sync(); return (serport[LSR] & 0x20); } -char recv(char *serport) { +inline int chr(char *serport) +{ + sync(); + return serport[LSR] & 1; +} + +inline char recv(char *serport) { char c; - while( !(serport[LSR] & 1) ) sync(); + while( !chr(serport) ) sync(); c = serport[RCV]; sync(); @@ -167,8 +174,6 @@ sync(); serport[LCR] = 3; sync(); - serport[IER] = 1; - sync(); } void SerialSetUp(int deviceType, void *deviceAddr, int baud) @@ -178,11 +183,11 @@ setup(serport, baud); } -extern void SerialInterrupt(); - -void Wait() -{ - while(!Continue) if (rdy(serport)) SerialInterrupt(); +extern int SerialInterrupt(int signal, ppc_trap_frame_t *tf); + +void IntEnable() +{ + serport[IER] |= 1; } void SerialWrite(int ch) @@ -240,22 +245,44 @@ void PacketFinish() { - int i, ch; + int i, ch, count = 0; PacketSent = 0; do { - SerialWrite('$'); - for (i = 0; i < DataOutAddr; i++) - { - SerialWrite(DataOutBuffer[i]); - } - SerialWrite('#'); - SerialWrite(hex[(DataOutCsum >> 4) & 15]); - SerialWrite(hex[DataOutCsum & 15]); - - while(!rdy(serport)); - if (SerialRead() == '+') break; + if (!count) + { + SerialWrite('$'); + for (i = 0; i < DataOutAddr; i++) + { + SerialWrite(DataOutBuffer[i]); + } + SerialWrite('#'); + SerialWrite(hex[(DataOutCsum >> 4) & 15]); + SerialWrite(hex[DataOutCsum & 15]); + } + while(count-- != 0) + { + if (chr(serport)) + { + ch = SerialRead(); + break; + } + } + + switch (ch) + { + default: + break; + + case '-': + count = 0; + break; + + case '+': + PacketSent = 1; + break; + } } while(PacketSent != 1); } @@ -293,10 +320,13 @@ PacketFinish(); } +void marker() { } + void GotPacket() { int i, memaddr, memsize; - + + Continue = 0; switch (DataInBuffer[DataInAddr++]) { case 'g': @@ -349,10 +379,16 @@ Continue = 1; break; + case 'S': + PacketOk(); + Continue = 0; + break; + case 's': - RegisterSaveArea->srr1 |= 16; + RegisterSaveArea->srr1 |= 0x400; PacketOk(); Continue = 1; + marker(); break; case 'q': @@ -374,59 +410,74 @@ } } -void SerialInterrupt() -{ - int ch = SerialRead(); - - if (ch == '+') +int SerialInterrupt(int signal, ppc_trap_frame_t *tf) +{ + int ch; + + if (!chr(serport)) return 0; + + Signal = signal; + RegisterSaveArea = tf; + + do { - PacketSent = 1; - } - else if (ch == '-') - { - PacketSent = -1; - } - else if (ch == '$') - { - DataInAddr = 0; - ParseState = 0; - ComputedCsum = 0; - ActualCsum = 0; - } - else if (ch == '#' && ParseState == 0) - { - ParseState = 2; - } - else if (ParseState == 0) - { - ComputedCsum += ch; - DataInBuffer[DataInAddr++] = ch; - } - else if (ParseState == 2) - { - ActualCsum = ch; - ParseState++; - } - else if (ParseState == 3) - { - ActualCsum = hex2int(ch) | (hex2int(ActualCsum) << 4); - ComputedCsum &= 255; - ParseState = -1; - if (ComputedCsum == ActualCsum) - { + ch = SerialRead(); + + if (ch == 3) /* Break in - tehe */ + { + Continue = 0; + PacketWriteSignal(3); + } + else if (ch == '-' || ch == '+') + { + /* Nothing */ + } + else if (ch == '$') + { + DataInAddr = 0; + ParseState = 0; ComputedCsum = 0; - DataInBuffer[DataInAddr] = 0; - DataInAddr = 0; - Continue = 0; - SerialWrite('+'); - GotPacket(); - } - else + ActualCsum = 0; + } + else if (ch == '#' && ParseState == 0) + { + ParseState = 2; + } + else if (ParseState == 0) + { + ComputedCsum += ch; + DataInBuffer[DataInAddr++] = ch; + } + else if (ParseState == 2) + { + ActualCsum = ch; + ParseState++; + } + else if (ParseState == 3) + { + ActualCsum = hex2int(ch) | (hex2int(ActualCsum) << 4); + ComputedCsum &= 255; + ParseState = -1; + if (ComputedCsum == ActualCsum) + { + ComputedCsum = 0; + DataInBuffer[DataInAddr] = 0; + DataInAddr = 0; + Continue = 0; + SerialWrite('+'); + GotPacket(); + } + else + SerialWrite('-'); + } + else if (ParseState == -1) SerialWrite('-'); } -} - -void TakeException(int n, int *tf) + while (!Continue); + return 1; +} + +int TakeException(int n, ppc_trap_frame_t *tf) { Signal = n; RegisterSaveArea = tf; @@ -434,7 +485,8 @@ PacketWriteSignal(Signal); SendSignal = 0; Continue = 0; - Wait(); + while(!Continue) SerialInterrupt(n, tf); + return 1; } /* EOF */ Modified: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Thu Oct 18 12:12:28 2007 @@ -68,7 +68,8 @@ extern void fmtout(const char *fmt, ...); int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr); void SerialSetUp(int deviceType, void *deviceAddr, int baud); -void TakeException(int n, int *tf); +int SerialInterrupt(int n, ppc_trap_frame_t *tf); +void TakeException(int n, ppc_trap_frame_t *tf); int _mmumain(int action, void *arg1, void *arg2, void *arg3, void *tf) { @@ -83,36 +84,42 @@ if(!ptegreload(trap_frame, trap_frame->dar)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); - if (!callback[action](action,tf)) hang(action, tf); + if (!callback[action](action,trap_frame)) hang(action, trap_frame); } break; case 4: if(!ptegreload(trap_frame, trap_frame->srr0)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); - if (!callback[action](action,tf)) hang(action, tf); - } - break; - + if (!callback[action](action,trap_frame)) hang(action, trap_frame); + } + break; + + case 5: + /* EE -- Try to get a serial interrupt if debugging enabled, then fall + * back to primary handler + */ + if (!SerialInterrupt(action, trap_frame)) + callback[action](action, trap_frame); + else + trap_frame->srr1 |= 0x8000; + break; case 0: case 2: - case 5: case 6: case 7: case 8: case 9: case 0xa: - if (!callback[action](action,tf)) hang(action, tf); - break; - + case 0xc: case 0x20: - // Single step - TakeException(action, tf); + if (!callback[action](action,trap_frame)) hang(action, trap_frame); break; /* MMU Functions */ case 0x100: initme(); + trap_frame->srr1 |= 0x8000; break; case 0x101: ret = mmuaddpage(arg1, (int)arg2); @@ -161,7 +168,7 @@ SerialSetUp((int)arg1, arg2, 9600); break; case 0x201: - TakeException((int)arg1, (int *)trap_frame); + TakeException((int)arg1, trap_frame); break; default: @@ -251,7 +258,7 @@ GdbAttach = 1; SerialSetUp(0, (void *)0x800003f8, 9600); } - TakeException(trapCode, (int *)trap); + while(1) SerialInterrupt(trapCode, trap); return 1; } @@ -294,11 +301,17 @@ copy_trap_handler(i); } + /* Serial Interrupt */ + callback[5] = SerialInterrupt; + /* Floating point exception */ callback[8] = fpenable; /* Ignore decrementer and EE */ callback[9] = ignore; + + /* Single Step */ + callback[0x20] = TakeException; } ppc_map_t *allocpage()

1 0

[mnordell] 29657: Move variable definition to before first code statement. GCC did not catch this due to its language extensions.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 12:11:32 2007 New Revision: 29657 URL: http://svn.reactos.org/svn/reactos?rev=29657&view=rev Log: Move variable definition to before first code statement. GCC did not catch this due to its language extensions. Modified: trunk/reactos/hal/halx86/generic/sysinfo.c Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c Thu Oct 18 12:11:32 2007 @@ -46,8 +46,8 @@ // us it expected a single byte back. We therefore guess it expects // a BOOLEAN, and we dream up the value TRUE to (we think) tell it // "Sure, the framebuffer is cached". + BOOLEAN ToReturn = TRUE; DPRINT("%s: caller expects %u bytes (should be 1)\n", "HalFrameBufferCachingInformation", BufferSize); - BOOLEAN ToReturn = TRUE; ASSERT(sizeof(BOOLEAN) == 1); *ReturnedLength = sizeof(BOOLEAN); RtlCopyMemory(Buffer, &ToReturn, sizeof(BOOLEAN));

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs