Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[rharabien] 51525: [WIN32K] * Redraw desktop after change of system colors. Inspired by Wine
by rharabien＠svn.reactos.org 01 May '11

01 May '11

Author: rharabien Date: Sun May 1 12:59:48 2011 New Revision: 51525 URL: http://svn.reactos.org/svn/reactos?rev=51525&view=rev Log: [WIN32K] * Redraw desktop after change of system colors. Inspired by Wine Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sun May 1 12:59:48 2011 @@ -519,6 +519,8 @@ if (Ret) { UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); + + UserRedrawDesktop(); } UserLeave();

1 0

[rharabien] 51524: [EXPLORER] * Properly support WM_SYSCOLORCHANGE
by rharabien＠svn.reactos.org 01 May '11

01 May '11

Author: rharabien Date: Sun May 1 12:58:15 2011 New Revision: 51524 URL: http://svn.reactos.org/svn/reactos?rev=51524&view=rev Log: [EXPLORER] * Properly support WM_SYSCOLORCHANGE Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Sun May 1 12:58:15 2011 @@ -464,11 +464,12 @@ goto def; case WM_SYSCOLORCHANGE: - // redraw background window - InvalidateRect(g_Globals._hwndShellView, NULL, TRUE); - - // forward message to shell view window to redraw icon backgrounds - SendMessage(g_Globals._hwndShellView, WM_SYSCOLORCHANGE, wparam, lparam); + // redraw background window - it's done by system + //InvalidateRect(g_Globals._hwndShellView, NULL, TRUE); + + // forward message to common controls + SendMessage(g_Globals._hwndShellView, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(_desktopBar, WM_SYSCOLORCHANGE, 0, 0);OutputDebugStringA("WM_SYSCOLORCHANGE desktop\n"); break; default: def: Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Sun May 1 12:58:15 2011 @@ -372,6 +372,11 @@ SendMessage(_hstatusbar, SB_SETTEXT, 0, lparam); break; + case WM_SYSCOLORCHANGE: + SendMessage(_hwndrebar, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(_htoolbar, WM_SYSCOLORCHANGE, 0, 0); + break; + default: return false; } @@ -993,6 +998,20 @@ } return TRUE;} // success + case WM_SYSCOLORCHANGE: { + LRESULT res; + HWND hChild; + + /* Forward WM_SYSCOLORCHANGE to common controls */ + SendMessage(_hextrabar, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(_hdrivebar, WM_SYSCOLORCHANGE, 0, 0); + + for(hChild = GetNextWindow(_hmdiclient,GW_CHILD); hChild; hChild = GetNextWindow(hChild, GW_HWNDNEXT)) + SendMessage(hChild, WM_SYSCOLORCHANGE, 0, 0); + + super::ProcessMessage(nmsg, wparam, lparam, &res); + break; } + default: { LRESULT res; Modified: trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] Sun May 1 12:58:15 2011 @@ -701,6 +701,12 @@ } return TRUE;} + case WM_SYSCOLORCHANGE: + /* Forward WM_SYSCOLORCHANGE to common controls */ + SendMessage(_left_hwnd, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(_right_hwnd, WM_SYSCOLORCHANGE, 0, 0); + break; + default: return super::WndProc(nmsg, wparam, lparam); } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sun May 1 12:58:15 2011 @@ -345,6 +345,15 @@ case PM_GET_NOTIFYAREA: return (LRESULT)(HWND)_hwndNotify; + case WM_SYSCOLORCHANGE:OutputDebugStringA("WM_SYSCOLORCHANGE desktopbar\n"); + /* Forward WM_SYSCOLORCHANGE to common controls */ +#ifndef _NO_REBAR + SendMessage(_hwndrebar, WM_SYSCOLORCHANGE, 0, 0); +#endif + SendMessage(_hwndQuickLaunch, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(_hwndTaskBar, WM_SYSCOLORCHANGE, 0, 0); + break; + default: def: return super::WndProc(nmsg, wparam, lparam); } Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Sun May 1 12:58:15 2011 @@ -201,6 +201,10 @@ case PM_GET_LAST_ACTIVE: return (LRESULT)(HWND)_last_foreground_wnd; + + case WM_SYSCOLORCHANGE: + SendMessage(_htoolbar, WM_SYSCOLORCHANGE, 0, 0); + break; default: def: if (nmsg == WM_SHELLHOOK) {

1 0

[rharabien] 51523: [APPLICATIONS] * Properly support WM_SYSCOLORCHANGE in msconfig, mspaint, rapps, regedit and regedit
by rharabien＠svn.reactos.org 01 May '11

01 May '11

Author: rharabien Date: Sun May 1 12:53:10 2011 New Revision: 51523 URL: http://svn.reactos.org/svn/reactos?rev=51523&view=rev Log: [APPLICATIONS] * Properly support WM_SYSCOLORCHANGE in msconfig, mspaint, rapps, regedit and regedit Modified: trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/mspaint/winproc.c trunk/reactos/base/applications/rapps/winmain.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/sndvol32/sndvol32.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Sun May 1 12:53:10 2011 @@ -210,6 +210,13 @@ { MsConfig_OnTabWndSelChange(); } + break; + + case WM_SYSCOLORCHANGE: + /* Forward WM_SYSCOLORCHANGE to common controls */ + SendMessage(hServicesListCtrl, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(hStartupListCtrl, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(hToolsListCtrl, WM_SYSCOLORCHANGE, 0, 0); break; case WM_DESTROY: Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Sun May 1 12:53:10 2011 @@ -691,6 +691,14 @@ break; // menu and button events + + case WM_SYSCOLORCHANGE: + { + /* Redirect message to common controls */ + HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); + SendMessage(hToolbar, WM_SYSCOLORCHANGE, 0, 0); + break; + } case WM_COMMAND: switch (LOWORD(wParam)) Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sun May 1 12:53:10 2011 @@ -717,6 +717,15 @@ return TRUE; } + case WM_SYSCOLORCHANGE: + { + /* Forward WM_SYSCOLORCHANGE to common controls */ + SendMessage(hListView, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(hTreeView, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(hToolBar, WM_SYSCOLORCHANGE, 0, 0); + } + break; + case WM_DESTROY: { ShowWindow(hwnd, SW_HIDE); Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sun May 1 12:53:10 2011 @@ -1177,6 +1177,11 @@ case WM_MENUSELECT: OnMenuSelect(hWnd, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); break; + case WM_SYSCOLORCHANGE: + /* Forward WM_SYSCOLORCHANGE to common controls */ + SendMessage(g_pChildWnd->hListWnd, WM_SYSCOLORCHANGE, 0, 0); + SendMessage(g_pChildWnd->hTreeWnd, WM_SYSCOLORCHANGE, 0, 0); + break; case WM_DESTROY: WinHelp(hWnd, _T("regedit"), HELP_QUIT, 0); PostQuitMessage(0); Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Sun May 1 12:53:10 2011 @@ -579,7 +579,7 @@ { HWND hwndControls; - /* Forward WM_SYSCOLORCHANGE to common controls */ + /* Forward WM_SYSCOLORCHANGE */ hwndControls = GetDlgItem(hwndDlg, IDC_CONTROLS); SendMessage(hwndControls, WM_SYSCOLORCHANGE, 0, 0); break;

1 0

[rharabien] 51522: [COMCTL32] * Sync Rebar to Wine 1.3.19 * Properly support WM_SYSCOLORCHANGE in Rebars * Update comctl32_ros.diff
by rharabien＠svn.reactos.org 01 May '11

01 May '11

Author: rharabien Date: Sun May 1 12:49:38 2011 New Revision: 51522 URL: http://svn.reactos.org/svn/reactos?rev=51522&view=rev Log: [COMCTL32] * Sync Rebar to Wine 1.3.19 * Properly support WM_SYSCOLORCHANGE in Rebars * Update comctl32_ros.diff Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Sun May 1 12:49:38 2011 @@ -143,7 +143,15 @@ =================================================================== --- listview.c (revision 51320) +++ listview.c (working copy) -@@ -1634,8 +1635,19 @@ +@@ -315,6 +315,7 @@ + COLORREF clrBk; + COLORREF clrText; + COLORREF clrTextBk; ++ BOOL bDefaultBkColor; + + /* font */ + HFONT hDefaultFont; +@@ -1635,8 +1636,19 @@ /* used to handle collapse main item column case */ static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) { @@ -165,7 +173,7 @@ } /* Listview invalidation functions: use _only_ these functions to invalidate */ -@@ -5041,7 +5053,11 @@ +@@ -5042,7 +5054,11 @@ /* Draw marquee rectangle if appropriate */ if (infoPtr->bMarqueeSelect) @@ -177,3 +185,65 @@ if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); +@@ -7856,6 +7872,7 @@ + { + TRACE("(clrBk=%x)\n", clrBk); + ++ infoPtr->bDefaultBkColor = FALSE; + if(infoPtr->clrBk != clrBk) { + if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + infoPtr->clrBk = clrBk; +@@ -9248,6 +9265,7 @@ + infoPtr->clrText = CLR_DEFAULT; + infoPtr->clrTextBk = CLR_DEFAULT; + LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); ++ infoPtr->bDefaultBkColor = TRUE; + + /* set default values */ + infoPtr->nFocusedItem = -1; +@@ -11510,6 +11528,11 @@ + + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); ++ if (infoPtr->bDefaultBkColor) ++ { ++ LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); ++ infoPtr->bDefaultBkColor = TRUE; ++ } + return 0; + + /* case WM_TIMER: */ +Index: rebar.c +=================================================================== +--- rebar.c (revision 51320) ++++ rebar.c (working copy) +@@ -51,7 +51,6 @@ + * - WM_QUERYNEWPALETTE + * - WM_RBUTTONDOWN + * - WM_RBUTTONUP +- * - WM_SYSCOLORCHANGE + * - WM_VKEYTOITEM + * - WM_WININICHANGE + * Notifications: +@@ -2540,10 +2539,8 @@ + + /* initialize band */ + memset(lpBand, 0, sizeof(*lpBand)); +- lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : +- infoPtr->clrText; +- lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace : +- infoPtr->clrBk; ++ lpBand->clrFore = infoPtr->clrText; ++ lpBand->clrBack = infoPtr->clrBk; + lpBand->iImage = -1; + + REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); +@@ -3793,6 +3790,8 @@ + + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); ++ infoPtr->clrBtnText = comctl32_color.clrBtnText; ++ infoPtr->clrBtnFace = comctl32_color.clrBtnFace; + return 0; + + /* case WM_VKEYTOITEM: supported according to ControlSpy */ Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sun May 1 12:49:38 2011 @@ -7871,7 +7871,7 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrBk) { TRACE("(clrBk=%x)\n", clrBk); - + infoPtr->bDefaultBkColor = FALSE; if(infoPtr->clrBk != clrBk) { if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Sun May 1 12:49:38 2011 @@ -51,7 +51,6 @@ * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN * - WM_RBUTTONUP - * - WM_SYSCOLORCHANGE * - WM_VKEYTOITEM * - WM_WININICHANGE * Notifications: @@ -1524,8 +1523,9 @@ for (i = prev_visible(infoPtr, infoPtr->uNumBands); i > 0; i = prev_visible(infoPtr, i)) { REBAR_BAND *lpBand = REBAR_GetBand(infoPtr, i); - int height = lpBand->rcBand.bottom - lpBand->rcBand.top; int cyBreakExtra; /* additional cy for the rebar after a RBBS_BREAK on this band */ + + height = lpBand->rcBand.bottom - lpBand->rcBand.top; if (infoPtr->dwStyle & RBS_VARHEIGHT) cyBreakExtra = lpBand->cyRowSoFar; /* 'height' => 'lpBand->cyRowSoFar' + 'height'*/ @@ -1846,8 +1846,7 @@ return uChanged; } -static LRESULT -REBAR_InternalEraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc, const RECT *clip) +static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) /* Function: This erases the background rectangle by drawing */ /* each band with its background color (or the default) and */ /* draws each bands right separator if necessary. The row */ @@ -1950,14 +1949,10 @@ else { old = SetBkColor (hdc, new); - TRACE("%s background color=0x%06x, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n", + TRACE("%s background color=0x%06x, band %s\n", (lpBand->clrBack == CLR_NONE) ? "none" : ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""), - GetBkColor(hdc), - rcBand.left,rcBand.top, - rcBand.right,rcBand.bottom, - clip->left, clip->top, - clip->right, clip->bottom); + GetBkColor(hdc), wine_dbgstr_rect(&rcBand)); ExtTextOutW (hdc, 0, 0, ETO_OPAQUE, &rcBand, NULL, 0, 0); if (lpBand->clrBack != CLR_NONE) SetBkColor (hdc, old); @@ -2120,7 +2115,7 @@ REBAR_BAND *hitBand, *rowBeginBand; if(infoPtr->uNumBands <= 0) - ERR("There are no bands in this rebar"); + ERR("There are no bands in this rebar\n"); /* Up/down dragging can only occur when there is more than one * band in the rebar */ @@ -2544,10 +2539,8 @@ /* initialize band */ memset(lpBand, 0, sizeof(*lpBand)); - lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : - infoPtr->clrText; - lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace : - infoPtr->clrBk; + lpBand->clrFore = infoPtr->clrText; + lpBand->clrBack = infoPtr->clrBk; lpBand->iImage = -1; REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); @@ -2999,18 +2992,6 @@ TRACE("destroyed!\n"); return 0; } - - -static LRESULT -REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) -{ - RECT cliprect; - - if (GetClipBox ( hdc, &cliprect)) - return REBAR_InternalEraseBkGnd (infoPtr, hdc, &cliprect); - return 0; -} - static LRESULT REBAR_GetFont (const REBAR_INFO *infoPtr) @@ -3454,7 +3435,7 @@ TRACE("painting (%s)\n", wine_dbgstr_rect(&ps.rcPaint)); if (ps.fErase) { /* Erase area of paint if requested */ - REBAR_InternalEraseBkGnd (infoPtr, hdc, &ps.rcPaint); + REBAR_EraseBkGnd (infoPtr, hdc); } REBAR_Refresh (infoPtr, hdc); EndPaint (infoPtr->hwndSelf, &ps); @@ -3809,6 +3790,8 @@ case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); + infoPtr->clrBtnText = comctl32_color.clrBtnText; + infoPtr->clrBtnFace = comctl32_color.clrBtnFace; return 0; /* case WM_VKEYTOITEM: supported according to ControlSpy */

1 0

[jimtabor] 51521: [Win32k] - Patch by Erich HooverSend: WM_SYSKEYDOWN and WM_SYSKEYUP when the 'F10' key is used. See wine bug 19383 and http://www.winehq.org/pipermail/wine-patches/2009-October/07...
by jimtabor＠svn.reactos.org 01 May '11

01 May '11

Author: jimtabor Date: Sun May 1 11:51:22 2011 New Revision: 51521 URL: http://svn.reactos.org/svn/reactos?rev=51521&view=rev Log: [Win32k] - Patch by Erich HooverSend: WM_SYSKEYDOWN and WM_SYSKEYUP when the 'F10' key is used. See wine bug 19383 and http://www.winehq.org/pipermail/wine-patches/2009-October/079871.html for details. - Update key state for all hardware postings. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun May 1 11:51:22 2011 @@ -1297,9 +1297,10 @@ if (ki->dwFlags & KEYEVENTF_KEYUP) { Msg.message = WM_KEYUP; - if ((gQueueKeyStateTable[VK_MENU] & 0x80) && + if (((gQueueKeyStateTable[VK_MENU] & 0x80) && ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) || !(gQueueKeyStateTable[VK_CONTROL] & 0x80))) + || (wVkStripped == VK_F10)) { if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ (wVkStripped != VK_MENU)) /* <ALT>-down...<something else>-up */ @@ -1311,8 +1312,9 @@ else { Msg.message = WM_KEYDOWN; - if ((gQueueKeyStateTable[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && + if (((gQueueKeyStateTable[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && !(gQueueKeyStateTable[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) + || (wVkStripped == VK_F10)) { Msg.message = WM_SYSKEYDOWN; TrackSysKey = wVkStripped; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun May 1 11:51:22 2011 @@ -1006,8 +1006,7 @@ InsertTailList(&MessageQueue->HardwareMessagesListHead, &Message->ListEntry); - if (MessageBits & QS_KEY) - update_input_key_state( MessageQueue, Msg ); + update_input_key_state( MessageQueue, Msg ); } Message->QS_Flags = MessageBits;

1 0

[gadamopoulos] 51520: [winlogon] - Implement restarting the shell in case of a failure. kudos to hpoussin
by gadamopoulos＠svn.reactos.org 01 May '11

01 May '11

Author: gadamopoulos Date: Sun May 1 09:59:01 2011 New Revision: 51520 URL: http://svn.reactos.org/svn/reactos?rev=51520&view=rev Log: [winlogon] - Implement restarting the shell in case of a failure. kudos to hpoussin 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 [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun May 1 09:59:01 2011 @@ -54,6 +54,37 @@ DestroyEnvironmentBlock(lpEnvironment); return ret; } + +static BOOL +StartUserShell( + IN OUT PWLSESSION Session) +{ + LPVOID lpEnvironment = NULL; + BOOLEAN Old; + BOOL ret; + + /* Create environment block for the user */ + if (!CreateEnvironmentBlock(&lpEnvironment, Session->UserToken, TRUE)) + { + WARN("WL: CreateEnvironmentBlock() failed\n"); + return FALSE; + } + + /* Get privilege */ + /* FIXME: who should do it? winlogon or gina? */ + /* FIXME: reverting to lower privileges after creating user shell? */ + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); + + ret = Session->Gina.Functions.WlxActivateUserShell( + Session->Gina.Context, + L"Default", + NULL, /* FIXME */ + lpEnvironment); + + DestroyEnvironmentBlock(lpEnvironment); + return ret; +} + BOOL SetDefaultLanguage( @@ -167,8 +198,6 @@ IN OUT PWLSESSION Session) { PROFILEINFOW ProfileInfo; - LPVOID lpEnvironment = NULL; - BOOLEAN Old; BOOL ret = FALSE; /* Loading personal settings */ @@ -211,13 +240,6 @@ goto cleanup; } - /* Create environment block for the user */ - if (!CreateEnvironmentBlock(&lpEnvironment, Session->UserToken, TRUE)) - { - WARN("WL: CreateEnvironmentBlock() failed\n"); - goto cleanup; - } - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); @@ -228,16 +250,7 @@ goto cleanup; } - /* Get privilege */ - /* FIXME: who should do it? winlogon or gina? */ - /* FIXME: reverting to lower privileges after creating user shell? */ - RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - - if (!Session->Gina.Functions.WlxActivateUserShell( - Session->Gina.Context, - L"Default", - NULL, /* FIXME */ - lpEnvironment)) + if (!StartUserShell(Session)) { //WCHAR StatusMsg[256]; WARN("WL: WlxActivateUserShell() failed\n"); @@ -264,8 +277,6 @@ { UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); } - if (lpEnvironment) - DestroyEnvironmentBlock(lpEnvironment); RemoveStatusMessage(Session); if (!ret) { @@ -942,12 +953,30 @@ { return HandleMessageBeep(lParam); } + case LN_SHELL_EXITED: + { + /* lParam is the exit code */ + if(lParam != 1) + { + SetTimer(hwndDlg, 1, 1000, NULL); + } + break; + } default: { ERR("WM_LOGONNOTIFY case %d is unimplemented\n", wParam); } } return 0; + } + case WM_TIMER: + { + if (wParam == 1) + { + KillTimer(hwndDlg, 1); + StartUserShell(Session); + } + break; } case WLX_WM_SAS: {

1 0

[gadamopoulos] 51519: [win32k] - Do not try to initialize thread info in UserGetWindowObject. Do it in thread callout. Removing this hack is needed in order to use UserPostMessage in ProcessCallout...
by gadamopoulos＠svn.reactos.org 01 May '11

01 May '11

Author: gadamopoulos Date: Sun May 1 09:20:15 2011 New Revision: 51519 URL: http://svn.reactos.org/svn/reactos?rev=51519&view=rev Log: [win32k] - Do not try to initialize thread info in UserGetWindowObject. Do it in thread callout. Removing this hack is needed in order to use UserPostMessage in ProcessCallout when a process is terminating - Notify winlogon that the shell is exiting in order to restart the shell Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/reactos/undocuser.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sun May 1 09:20:15 2011 @@ -183,6 +183,13 @@ NTAPI PsGetProcessInheritedFromUniqueProcessId( IN PEPROCESS Process +); + +NTKERNELAPI +NTSTATUS +NTAPI +PsGetProcessExitStatus( + PEPROCESS Process ); // Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sun May 1 09:20:15 2011 @@ -77,6 +77,7 @@ // // Definitions used by WM_LOGONNOTIFY // +#define LN_SHELL_EXITED 0x2 #define LN_START_TASK_MANAGER 0x4 #define LN_LOCK_WORKSTATION 0x5 #define LN_UNLOCK_WORKSTATION 0x6 Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun May 1 09:20:15 2011 @@ -64,6 +64,8 @@ HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; + + PPROCESSINFO ppiShellProcess; union { Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun May 1 09:20:15 2011 @@ -128,6 +128,23 @@ DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); Win32Process->W32PF_flags |= W32PF_TERMINATED; + /* Notify logon application to restart shell if needed */ + if(Win32Process->rpdeskStartup->pDeskInfo) + { + if(Win32Process->rpdeskStartup->pDeskInfo->ppiShellProcess == Win32Process) + { + DWORD ExitCode; + ExitCode = PsGetProcessExitStatus(Win32Process->peProcess); + + DPRINT1("Shell process is exiting (%d)\n", ExitCode); + + UserPostMessage(hwndSAS, + WM_LOGONNOTIFY, + LN_SHELL_EXITED, + ExitCode); + } + } + if (Win32Process->InputIdleEvent) { EngFreeMem((PVOID)Win32Process->InputIdleEvent); @@ -243,6 +260,7 @@ } Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); + Win32Thread->pEThread = Thread; /* HAAAAAAAACK! This should go to Win32kProcessCallback */ if(Win32Thread->ppi->hdeskStartup == NULL) @@ -322,7 +340,7 @@ // System thread running! Now SendMessage should be okay. Win32Thread->pcti = &Win32Thread->cti; } - Win32Thread->pEThread = Thread; + GetW32ThreadInfo(); } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun May 1 09:20:15 2011 @@ -101,18 +101,7 @@ /* temp hack */ PWND FASTCALL UserGetWindowObject(HWND hWnd) { - PTHREADINFO ti; - PWND Window; - - if (PsGetCurrentProcess() != PsInitialSystemProcess) - { - ti = GetW32ThreadInfo(); - if (ti == NULL) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return NULL; - } - } + PWND Window; if (!hWnd) { @@ -3308,7 +3297,11 @@ WinStaObject->ShellListView = hwndListView; ti = GetW32ThreadInfo(); - if (ti->pDeskInfo) ti->pDeskInfo->hShellWindow = hwndShell; + if (ti->pDeskInfo) + { + ti->pDeskInfo->hShellWindow = hwndShell; + ti->pDeskInfo->ppiShellProcess = ti->ppi; + } UserDerefObjectCo(WndShell);

1 0

[hpoussin] 51518: Fix compilation
by hpoussin＠svn.reactos.org 01 May '11

01 May '11

Author: hpoussin Date: Sun May 1 08:17:26 2011 New Revision: 51518 URL: http://svn.reactos.org/svn/reactos?rev=51518&view=rev Log: Fix compilation Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S [iso-8859-1] Sun May 1 08:17:26 2011 @@ -34,9 +34,9 @@ _pxe_entry_point: .long 0 _pxe_buffer_segment: - .word0 + .word 0 _pxe_buffer_offset: - .word0 + .word 0 _pxe_result: .word 0

1 0

[hpoussin] 51517: [freeldr] Add PXE "filesystem"
by hpoussin＠svn.reactos.org 01 May '11

01 May '11

Author: hpoussin Date: Sun May 1 08:11:43 2011 New Revision: 51517 URL: http://svn.reactos.org/svn/reactos?rev=51517&view=rev Log: [freeldr] Add PXE "filesystem" Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S (with props) trunk/reactos/boot/freeldr/freeldr/fs/pxe.c (with props) trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h (with props) trunk/reactos/boot/freeldr/freeldr/include/fs/pxe.h (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S [iso-8859-1] Sun May 1 08:11:43 2011 @@ -1,0 +1,97 @@ +/* + * FreeLoader + * Copyright (C) 2011 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + .text + .code16 + +#define ASM + +#include <arch.h> + +/* + * U16 PxeCallApi(U16 Segment, U16 Offset, U16 Service, VOID *Parameter); + * + * RETURNS: + */ +_pxe_function: + .word 0 +_pxe_entry_point: + .long 0 +_pxe_buffer_segment: + .word0 +_pxe_buffer_offset: + .word0 +_pxe_result: + .word 0 + +EXTERN(_PxeCallApi) + .code32 + pushl %ebp + movl %esp,%ebp + + pushal + push %es + + /* copy entry point */ + movl 0x08(%ebp),%eax + shll $16,%eax + movw 0x0C(%ebp),%ax + movl %eax,_pxe_entry_point + + /* copy function */ + movw 0x10(%ebp),%ax + movw %ax,_pxe_function + + /* convert pointer to data buffer to segment/offset */ + movl 0x14(%ebp),%eax + shrl $4,%eax + andl $0xf000,%eax + movw %ax,_pxe_buffer_segment + movl 0x14(%ebp),%eax + andl $0xffff,%eax + movw %ax,_pxe_buffer_offset + + call switch_to_real + .code16 + + movw _pxe_buffer_segment,%ax + push %ax + movw _pxe_buffer_offset,%ax + push %ax + movw _pxe_function,%ax + push %ax + lcall *_pxe_entry_point + addw $6,%sp + movw %ax,_pxe_result + + call switch_to_prot + .code32 + + pop %es + popal + + movl %ebp,%esp + popl %ebp + + movw _pxe_result,%ax + + ret + +/* EOF */ + Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sun May 1 08:11:43 2011 @@ -43,7 +43,7 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; - MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootPath = PcDiskGetBootPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sun May 1 08:11:43 2011 @@ -367,4 +367,15 @@ } } +BOOLEAN +PcDiskGetBootPath(char *BootPath, unsigned Size) +{ + if (PxeInit()) + { + strcpy(BootPath, "net(0)"); + return 0; + } + return DiskGetBootPath(BootPath, Size); +} + /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Sun May 1 08:11:43 2011 @@ -33,6 +33,7 @@ <file>fs.c</file> <file>iso.c</file> <file>ntfs.c</file> + <file>pxe.c</file> </directory> <directory name="inifile"> <file>ini_init.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] Sun May 1 08:11:43 2011 @@ -12,6 +12,7 @@ <file>i386cpu.S</file> <file>i386idt.S</file> <file>i386pnp.S</file> + <file>i386pxe.S</file> <file>i386trap.S</file> <file>int386.S</file> <file>linux.S</file> Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sun May 1 08:11:43 2011 @@ -339,6 +339,10 @@ if (!FileData[DeviceId].FileFuncTable) FileData[DeviceId].FileFuncTable = Ext2Mount(DeviceId); #endif +#ifdef _M_IX86 + if (!FileData[DeviceId].FileFuncTable) + FileData[DeviceId].FileFuncTable = PxeMount(DeviceId); +#endif if (!FileData[DeviceId].FileFuncTable) { /* Error, unable to detect file system */ Added: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c (added) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Sun May 1 08:11:43 2011 @@ -1,0 +1,362 @@ +/* + * FreeLoader + * Copyright (C) 2011 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <freeldr.h> + +#define NDEBUG +#include <debug.h> + +#define NO_FILE ((ULONG)-1) + +static IP4 _ServerIP = { 0, }; +static ULONG _OpenFile = NO_FILE; +static ULONG _FileSize = 0; +static ULONG _FilePosition = 0; +static ULONG _PacketPosition = 0; +static UCHAR _Packet[4096]; +static UCHAR* _CachedFile = NULL; +static ULONG _CachedLength = 0; + +static PPXE +FindPxeStructure(VOID) +{ + PPXE Ptr; + UCHAR Checksum; + UCHAR i; + + /* Find the '!PXE' structure */ + Ptr = (PPXE)0xA0000; + while ((ULONG)Ptr > 0x10000) + { + Ptr = (PPXE)((ULONG)Ptr - 0x10); + + /* Look for signature */ + if (memcmp(Ptr, "!PXE", 4) != 0) + continue; + + /* Check size */ + if (Ptr->StructLength != sizeof(PXE)) + continue; + + /* Check checksum */ + Checksum = 0; + for (i = 0; i < Ptr->StructLength; i++) + Checksum += *((PUCHAR)Ptr + i); + if (Checksum != 0) + continue; + + DPRINTM(DPRINT_FILESYSTEM, "!PXE structure found at %p\n", Ptr); + return Ptr; + } + + return NULL; +} + +static PPXE GetPxeStructure(VOID) +{ + static PPXE pPxe = NULL; + static BOOLEAN bPxeSearched = FALSE; + if (!bPxeSearched) + { + pPxe = FindPxeStructure(); + bPxeSearched = TRUE; + } + return pPxe; +} + +extern PXENV_EXIT PxeCallApi(UINT16 Segment, UINT16 Offset, UINT16 Service, VOID *Parameter); +BOOLEAN CallPxe(UINT16 Service, PVOID Parameter) +{ + PPXE pxe; + PXENV_EXIT exit; + + pxe = GetPxeStructure(); + if (!pxe) + return FALSE; + + if (Service != PXENV_TFTP_READ) + { + // HACK: this delay shouldn't be necessary + KeStallExecutionProcessor(100 * 1000); // 100 ms + DPRINTM(DPRINT_FILESYSTEM, "PxeCall(0x%x, %p)\n", Service, Parameter); + } + + exit = PxeCallApi(pxe->EntryPointSP.segment, pxe->EntryPointSP.offset, Service, Parameter); + if (exit != PXENV_EXIT_SUCCESS) + { + DPRINTM(DPRINT_FILESYSTEM, "PxeCall(0x%x, %p) failed with exit=%d status=0x%x\n", + Service, Parameter, exit, *(PXENV_STATUS*)Parameter); + return FALSE; + } + if (*(PXENV_STATUS*)Parameter != PXENV_STATUS_SUCCESS) + { + DPRINTM(DPRINT_FILESYSTEM, "PxeCall(0x%x, %p) succeeded, but returned error status 0x%x\n", + Service, Parameter, *(PXENV_STATUS*)Parameter); + return FALSE; + } + return TRUE; +} + +static LONG PxeClose(ULONG FileId) +{ + t_PXENV_TFTP_CLOSE closeData; + + if (_OpenFile == NO_FILE || FileId != _OpenFile) + return EBADF; + + RtlZeroMemory(&closeData, sizeof(closeData)); + if (!CallPxe(PXENV_TFTP_CLOSE, &closeData)) + return EIO; + + _OpenFile = NO_FILE; + if (_CachedFile) + { + MmHeapFree(_CachedFile); + _CachedFile = NULL; + } + return ESUCCESS; +} + +static LONG PxeGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + if (_OpenFile == NO_FILE || FileId != _OpenFile) + return EBADF; + + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = _FileSize; + Information->CurrentAddress.LowPart = _FilePosition; + + return ESUCCESS; +} + +static LONG PxeOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + t_PXENV_TFTP_GET_FSIZE sizeData; + t_PXENV_TFTP_OPEN openData; + + if (_OpenFile != NO_FILE) + return EIO; + if (OpenMode != OpenReadOnly) + return EACCES; + + RtlZeroMemory(&sizeData, sizeof(sizeData)); + sizeData.ServerIPAddress = _ServerIP; + strncpy((CHAR*)sizeData.FileName, Path, sizeof(sizeData.FileName)); + if (!CallPxe(PXENV_TFTP_GET_FSIZE, &sizeData)) + return EIO; + _FileSize = sizeData.FileSize; + if (_FileSize < 1024 * 1024) + { + _CachedFile = MmHeapAlloc(_FileSize); + // Don't check for allocation failure, we support _CachedFile = NULL + } + _CachedLength = 0; + + RtlZeroMemory(&openData, sizeof(openData)); + openData.ServerIPAddress = _ServerIP; + strncpy((CHAR*)openData.FileName, Path, sizeof(openData.FileName)); + openData.PacketSize = sizeof(_Packet); + + if (!CallPxe(PXENV_TFTP_OPEN, &openData)) + { + if (_CachedFile) + { + MmHeapFree(_CachedFile); + _CachedFile = NULL; + } + return ENOENT; + } + + _FilePosition = 0; + _PacketPosition = 0; + + _OpenFile = *FileId; + return ESUCCESS; +} + +static LONG PxeRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + t_PXENV_TFTP_READ readData; + ULONG i; + + *Count = 0; + + if (_OpenFile == NO_FILE || FileId != _OpenFile) + return EBADF; + + RtlZeroMemory(&readData, sizeof(readData)); + readData.Buffer.segment = ((UINT32)_Packet & 0xf0000) / 16; + readData.Buffer.offset = (UINT32)_Packet & 0xffff; + + // Get new packets as required + while (N > 0) + { + if (N < _CachedLength - _FilePosition) + i = N; + else + i = _CachedLength - _FilePosition; + if (_CachedFile) + RtlCopyMemory(Buffer, _CachedFile + _FilePosition, i); + else + RtlCopyMemory(Buffer, _Packet + _FilePosition - _PacketPosition, i); + _FilePosition += i; + Buffer = (UCHAR*)Buffer + i; + *Count += i; + N -= i; + if (N == 0) + break; + + if (!CallPxe(PXENV_TFTP_READ, &readData)) + return EIO; + if (_CachedFile) + RtlCopyMemory(_CachedFile + _CachedLength, _Packet, readData.BufferSize); + _PacketPosition = _CachedLength; + _CachedLength += readData.BufferSize; + } + + return ESUCCESS; +} + +static LONG PxeSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + t_PXENV_TFTP_READ readData; + + if (_OpenFile == NO_FILE || FileId != _OpenFile) + return EBADF; + + if (Position->HighPart != 0 || SeekMode != SeekAbsolute) + return EINVAL; + + if (!_CachedFile && Position->LowPart < _FilePosition) + // We don't support backward seek without caching + return EINVAL; + + RtlZeroMemory(&readData, sizeof(readData)); + readData.Buffer.segment = ((UINT32)_Packet & 0xf0000) / 16; + readData.Buffer.offset = (UINT32)_Packet & 0xffff; + + // Get new packets as required + while (Position->LowPart > _CachedLength) + { + if (!CallPxe(PXENV_TFTP_READ, &readData)) + return EIO; + if (_CachedFile) + { + RtlCopyMemory(_CachedFile + _CachedLength, _Packet, readData.BufferSize); + } + _PacketPosition = _CachedLength; + _CachedLength += readData.BufferSize; + } + + _FilePosition = Position->LowPart; + return ESUCCESS; +} + +static const DEVVTBL PxeVtbl = { + PxeClose, + PxeGetFileInformation, + PxeOpen, + PxeRead, + PxeSeek, +}; + +const DEVVTBL* PxeMount(ULONG DeviceId) +{ + if (GetPxeStructure() == NULL) + return NULL; + return &PxeVtbl; +} + +static LONG PxeDiskClose(ULONG FileId) +{ + // Nothing to do + return ESUCCESS; +} + +static LONG PxeDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + // Not implemented + return EINVAL; +} + +static LONG PxeDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + // Nothing to do + return ESUCCESS; +} + +static LONG PxeDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + // Not implemented + return EINVAL; +} + +static LONG PxeDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + // Not implemented + return EINVAL; +} + +static const DEVVTBL PxeDiskVtbl = { + PxeDiskClose, + PxeDiskGetFileInformation, + PxeDiskOpen, + PxeDiskRead, + PxeDiskSeek, +}; + +static BOOLEAN GetCachedInfo(VOID) +{ + t_PXENV_GET_CACHED_INFO Data; + BOOLEAN res; + UCHAR* Packet; + + RtlZeroMemory(&Data, sizeof(Data)); + Data.PacketType = PXENV_PACKET_TYPE_CACHED_REPLY; + + res = CallPxe(PXENV_GET_CACHED_INFO, &Data); + if (!res) + return FALSE; + if (Data.BufferSize < 36) + return FALSE; + Packet = (UCHAR*)((UINT32)(Data.Buffer.segment << 4) + Data.Buffer.offset); + RtlCopyMemory(&_ServerIP, Packet + 20, sizeof(IP4)); + return TRUE; +} + +BOOLEAN PxeInit(VOID) +{ + static BOOLEAN Initialized = FALSE; + static BOOLEAN Status = FALSE; + + // Do initialization only once + if (Initialized) + return Status; + Initialized = TRUE; + + // Check if PXE is available + if (GetPxeStructure() && GetCachedInfo()) + { + FsRegisterDevice("net(0)", &PxeDiskVtbl); + Status = TRUE; + } + + return Status; +} + Propchange: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h [iso-8859-1] Sun May 1 08:11:43 2011 @@ -91,4 +91,7 @@ ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, UCHAR *NodeBuffer); +/* i386pxe.S */ +USHORT PxeCallApi(USHORT Segment, USHORT Offset, USHORT Service, VOID* Parameter); + /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] Sun May 1 08:11:43 2011 @@ -48,6 +48,7 @@ ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); +BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size); BOOLEAN PcDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h [iso-8859-1] Sun May 1 08:11:43 2011 @@ -1,0 +1,602 @@ +#ifndef _PXE_ +#define _PXE_ + +/* Basic types */ + +typedef UINT16 OFF16; +typedef UINT16 PXENV_EXIT; +typedef UINT16 PXENV_STATUS; +typedef UINT16 SEGSEL; +typedef UINT16 UDP_PORT; +typedef UINT32 ADDR32; + +#include <pshpack1.h> + +#define IP_ADDR_LEN 4 +typedef union +{ + UINT32 num; + UINT8 array[IP_ADDR_LEN]; +} IP4; + +#define MAC_ADDR_LEN 16 +typedef UINT8 MAC_ADDR[MAC_ADDR_LEN]; + +typedef struct s_SEGDESC +{ + UINT16 segment_address; + UINT32 physical_address; + UINT16 seg_size; +} SEGDESC; + +typedef struct s_SEGOFF16 +{ + OFF16 offset; + SEGSEL segment; +} SEGOFF16; + +typedef struct s_PXE +{ + UINT8 Signature[4]; + UINT8 StructLength; + UINT8 StructCksum; + UINT8 StructRev; + UINT8 reserved1; + SEGOFF16 UNDIROMID; + SEGOFF16 BaseROMID; + SEGOFF16 EntryPointSP; + SEGOFF16 EntryPointESP; + SEGOFF16 StatusCallout; + UINT8 reserved2; + UINT8 SegDescCnt; + SEGSEL FirstSelector; + SEGDESC Stack; + SEGDESC UNDIData; + SEGDESC UNDICode; + SEGDESC UNDICodeWrite; + SEGDESC BC_Data; + SEGDESC BC_Code; + SEGDESC BC_CodeWrite; +} PXE, *PPXE; + +/* PXENV structures */ + +typedef struct s_PXENV_START_UNDI +{ + PXENV_STATUS Status; + UINT16 AX; + UINT16 BX; + UINT16 DX; + UINT16 DI; + UINT16 ES; +} t_PXENV_START_UNDI; + +typedef struct s_PXENV_UNDI_STARTUP +{ + PXENV_STATUS Status; +} t_PXENV_UNDI_STARTUP; + +typedef struct s_PXENV_UNDI_CLEANUP +{ + PXENV_STATUS Status; +} t_PXENV_UNDI_CLEANUP; + +typedef struct s_PXENV_UNDI_INITIALIZE +{ + PXENV_STATUS Status; + ADDR32 ProtocolIni; + UINT8 reserved[8]; +} t_PXENV_UNDI_INITIALIZE; + +#define MAXNUM_MCADDR 8 +typedef struct s_PXENV_UNDI_MCAST_ADDRESS +{ + UINT16 MCastAddrCount; + MAC_ADDR McastAddr[MAXNUM_MCADDR]; +} t_PXENV_UNDI_MCAST_ADDRESS; + +typedef struct s_PXENV_UNDI_RESET +{ + PXENV_STATUS Status; + t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf; +} t_PXENV_UNDI_RESET; + +typedef struct s_PXENV_UNDI_SHUTDOWN +{ + PXENV_STATUS Status; +} t_PXENV_UNDI_SHUTDOWN; + +typedef struct s_PXENV_UNDI_OPEN +{ + PXENV_STATUS Status; + UINT16 OpenFlag; + UINT16 PktFilter; +#define FLTR_DIRECTED 0x01 +#define FLTR_BRDCST 0x02 +#define FLTR_PRMSCS 0x04 +#define FLTR_SRC_RTG 0x08 + + t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf; +} t_PXENV_UNDI_OPEN; + +typedef struct s_PXENV_UNDI_CLOSE +{ + PXENV_STATUS Status; +} t_PXENV_UNDI_CLOSE; + +typedef struct s_PXENV_UNDI_TRANSMIT +{ + PXENV_STATUS Status; + UINT8 Protocol; +#define P_UNKNOWN 0 +#define P_IP 1 +#define P_ARP 2 +#define P_RARP 3 + + UINT8 XmitFlag; +#define XMT_DESTADDR 0x00 +#define XMT_BROADCAST 0x01 + + SEGOFF16 DestAddr; + SEGOFF16 TBD; + UINT32 Reserved[2]; +} t_PXENV_UNDI_TRANSMIT; + +#define MAX_DATA_BLKS 8 +typedef struct s_PXENV_UNDI_TBD +{ + UINT16 ImmedLength; + SEGOFF16 Xmit; + UINT16 DataBlkCount; + struct DataBlk + { + UINT8 TDPtrType; + UINT8 TDRsvdByte; + UINT8 TDDataLen; + SEGOFF16 TDDataPtr; + } DataBlock[MAX_DATA_BLKS]; +} t_PXENV_UNDI_TBD; + +typedef struct s_PXENV_UNDI_SET_MCAST_ADDRESS +{ + PXENV_STATUS Status; + t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf; +} t_PXENV_UNDI_SET_MCAST_ADDRESS; + +typedef struct s_PXENV_UNDI_SET_STATION_ADDRESS +{ + PXENV_STATUS Status; + MAC_ADDR StationAddress; +} t_PXENV_UNDI_SET_STATION_ADDRESS; + +typedef struct s_PXENV_UNDI_SET_PACKET_FILTER +{ + PXENV_STATUS Status; + UINT8 filter; +} t_PXENV_UNDI_SET_PACKET_FILTER; + +typedef struct s_PXENV_UNDI_GET_INFORMATION +{ + PXENV_STATUS Status; + UINT16 BaseIo; + UINT16 IntNumber; + UINT16 MaxTranUnit; + UINT16 HwType; +#define ETHER_TYPE 1 +#define EXP_ETHER_TYPE 2 +#define IEEE_TYPE 3 +#define ARCNET_TYPE 4 + + UINT16 HwAddrLen; + MAC_ADDR CurrentNodeAddress; + MAC_ADDR PermNodeAddress; + SEGSEL ROMAddress; + UINT16 RxBufCt; + UINT16 TxBufCt; +} t_PXENV_UNDI_GET_INFORMATION; + +typedef struct s_PXENV_UNDI_GET_STATISTICS +{ + PXENV_STATUS Status; + UINT32 XmtGoodFrames; + UINT32 RcvGoodFrames; + UINT32 RcvCRCErrors; + UINT32 RcvResourceErrors; +} t_PXENV_UNDI_GET_STATISTICS; + +typedef struct s_PXENV_UNDI_CLEAR_STATISTICS +{ + PXENV_STATUS Status; +} t_PXENV_UNDI_CLEAR_STATISTICS; + +typedef struct s_PXENV_UNDI_INITIATE_DIAGS +{ + PXENV_STATUS Status; +} t_PXENV_UNDI_INITIATE_DIAGS; + +typedef struct s_PXENV_UNDI_FORCE_INTERRUPT +{ + PXENV_STATUS Status; +} t_PXENV_UNDI_FORCE_INTERRUPT; + +typedef struct s_PXENV_UNDI_GET_MCAST_ADDRESS +{ + PXENV_STATUS Status; + IP4 InetAddr; + MAC_ADDR MediaAddr; +} t_PXENV_UNDI_GET_MCAST_ADDRESS; + +typedef struct s_PXENV_UNDI_GET_NIC_TYPE +{ + PXENV_STATUS Status; + UINT8 NicType; +#define PCI_NIC 2 +#define PnP_NIC 3 +#define CardBus_NIC 4 + + union + { + struct + { + UINT16 Vendor_ID; + UINT16 Dev_ID; + UINT8 Base_Class; + UINT8 Sub_Class; + UINT8 Prog_Intf; + UINT8 Rev; + UINT16 BusDevFunc; + UINT16 SubVendor_ID; + UINT16 SubDevice_ID; + } pci, cardbus; + struct + { + UINT32 EISA_Dev_ID; + UINT8 Base_Class; + UINT8 Sub_Class; + UINT8 Prog_Intf; + UINT16 CardSelNum; + } pnp; + } info; +} t_PXENV_UNDI_GET_NIC_TYPE; + +typedef struct s_PXENV_UNDI_GET_IFACE_INFO +{ + PXENV_STATUS Status; + UINT8 IfaceType[16]; + UINT32 LinkSpeed; + UINT32 ServiceFlags; + UINT32 Reserved[4]; +} t_PXENV_UNDI_GET_IFACE_INFO; + +typedef struct s_PXENV_UNDI_ISR +{ + PXENV_STATUS Status; + UINT16 FuncFlag; + UINT16 BufferLength; + UINT16 FrameLength; + UINT16 FrameHeaderLength; + SEGOFF16 Frame; + UINT8 ProtType; + UINT8 PktType; +} t_PXENV_UNDI_ISR; + +#define PXENV_UNDI_ISR_IN_START 1 +#define PXENV_UNDI_ISR_IN_PROCESS 2 +#define PXENV_UNDI_ISR_IN_GET_NEXT 3 + +/* One of these will be returned for PXENV_UNDI_ISR_IN_START */ +#define PXENV_UNDI_ISR_OUT_OURS 0 +#define PXENV_UNDI_ISR_OUT_NOT_OURS 1 + +/* One of these will be returned for PXENV_UNDI_ISR_IN_PROCESS and PXENV_UNDI_ISR_IN_GET_NEXT */ +#define PXENV_UNDI_ISR_OUT_DONE 0 +#define PXENV_UNDI_ISR_OUT_TRANSMIT 2 +#define PXENV_UNDI_ISR_OUT_RECEIVE 3 +#define PXENV_UNDI_ISR_OUT_BUSY 4 + +typedef struct s_PXENV_UNDI_GET_STATE +{ + PXENV_STATUS Status; +#define PXE_UNDI_GET_STATE_STARTED 1 +#define PXE_UNDI_GET_STATE_INITIALIZED 2 +#define PXE_UNDI_GET_STATE_OPENED 3 + UINT8 UNDIState; +} t_PXENV_UNDI_GET_STATE; + +typedef struct s_PXENV_STOP_UNDI +{ + PXENV_STATUS Status; +} t_PXENV_STOP_UNDI; + +typedef struct s_PXENV_TFTP_OPEN +{ + PXENV_STATUS Status; + IP4 ServerIPAddress; + IP4 GatewayIPAddress; + UINT8 FileName[128]; + UDP_PORT TFTPPort; + UINT16 PacketSize; +} t_PXENV_TFTP_OPEN; + +typedef struct s_PXENV_TFTP_CLOSE +{ + PXENV_STATUS Status; +} t_PXENV_TFTP_CLOSE; + +typedef struct s_PXENV_TFTP_READ +{ + PXENV_STATUS Status; + UINT16 PacketNumber; + UINT16 BufferSize; + SEGOFF16 Buffer; +} t_PXENV_TFTP_READ; + +typedef struct s_PXENV_TFTP_READ_FILE +{ + PXENV_STATUS Status; + UINT8 FileName[128]; + UINT32 BufferSize; + ADDR32 Buffer; + IP4 ServerIPAddress; + IP4 GatewayIPAddress; + IP4 McastIPAddress; + UDP_PORT TFTPClntPort; + UDP_PORT TFTPSvrPort; + UINT16 TFTPOpenTimeOut; + UINT16 TFTPReopenDelay; +} t_PXENV_TFTP_READ_FILE; + +typedef struct s_PXENV_TFTP_GET_FSIZE +{ + PXENV_STATUS Status; + IP4 ServerIPAddress; + IP4 GatewayIPAddress; + UINT8 FileName[128]; + UINT32 FileSize; +} t_PXENV_TFTP_GET_FSIZE; + +typedef struct s_PXENV_UDP_OPEN +{ + PXENV_STATUS Status; + IP4 src_ip; +} t_PXENV_UDP_OPEN; + +typedef struct s_PXENV_UDP_CLOSE +{ + PXENV_STATUS Status; +} t_PXENV_UDP_CLOSE; + +typedef struct s_PXENV_UDP_READ +{ + PXENV_STATUS Status; + IP4 ip; + IP4 dest_ip; + UDP_PORT s_port; + UDP_PORT d_port; + UINT16 buffer_size; + SEGOFF16 buffer; +} t_PXENV_UDP_READ; + +typedef struct s_PXENV_UDP_WRITE +{ + PXENV_STATUS Status; + IP4 ip; + IP4 gw; + UDP_PORT src_port; + UDP_PORT dst_port; + UINT16 buffer_size; + SEGOFF16 buffer; +} t_PXENV_UDP_WRITE; + +typedef struct s_PXENV_UNLOAD_STACK +{ + PXENV_STATUS Status; + UINT8 reserved[10]; +} t_PXENV_UNLOAD_STACK; + +typedef struct s_PXENV_GET_CACHED_INFO +{ + PXENV_STATUS Status; + UINT16 PacketType; +#define PXENV_PACKET_TYPE_DHCP_DISCOVER 1 +#define PXENV_PACKET_TYPE_DHCP_ACK 2 +#define PXENV_PACKET_TYPE_CACHED_REPLY 3 + UINT16 BufferSize; + SEGOFF16 Buffer; + UINT16 BufferLimit; +} t_PXENV_GET_CACHED_INFO; + +typedef struct s_PXENV_START_BASE +{ + PXENV_STATUS Status; +} t_PXENV_START_BASE; + +typedef struct s_PXENV_STOP_BASE +{ + PXENV_STATUS Status; +} t_PXENV_STOP_BASE; + +typedef struct bootph +{ + UINT8 opcode; +#define BOOTP_REQ 1 +#define BOOTP_REP 2 + + UINT8 Hardware; + UINT8 Hardlen; + UINT8 Gatehops; + UINT32 ident; + UINT16 seconds; + UINT16 Flags; +#define BOOTP_BCAST 0x8000 + + IP4 cip; + IP4 yip; + IP4 sip; + IP4 gip; + MAC_ADDR CAddr; + UINT8 Sname[64]; + UINT8 bootfile[128]; + union + { +#define BOOTP_DHCPVEND 1024 /* DHCP extended vendor field size */ + UINT8 d[BOOTP_DHCPVEND]; + struct + { + UINT8 magic[4]; +#define VM_RFC1048 0x63825363 + UINT32 flags; + UINT8 pad[56]; + } v; + } vendor; +} BOOTPLAYER; + +#include <poppack.h> + +/* Exit codes returned in AX by a PXENV API service */ +#define PXENV_EXIT_SUCCESS 0x0000 +#define PXENV_EXIT_FAILURE 0x0001 + +/* Generic API status & error codes that are reported by the loader */ +#define PXENV_STATUS_SUCCESS 0x00 +#define PXENV_STATUS_FAILURE 0x01 /* General failure */ +#define PXENV_STATUS_BAD_FUNC 0x02 /* Invalid function number */ +#define PXENV_STATUS_UNSUPPORTED 0x03 /* Function is not yet supported */ +#define PXENV_STATUS_KEEP_UNDI 0x04 /* UNDI must not be unloaded from base memory */ +#define PXENV_STATUS_KEEP_ALL 0x05 +#define PXENV_STATUS_OUT_OF_RESOURCES 0x06 /* Base code and UNDI must not be unloaded from base memory */ + +/* ARP errors (0x10 to 0x1f) */ +#define PXENV_STATUS_ARP_TIMEOUT 0x11 + +/* Base code state errors */ +#define PXENV_STATUS_UDP_CLOSED 0x18 +#define PXENV_STATUS_UDP_OPEN 0x19 +#define PXENV_STATUS_TFTP_CLOSED 0x1a +#define PXENV_STATUS_TFTP_OPEN 0x1b + +/* BIOS/system errors (0x20 to 0x2f) */ +#define PXENV_STATUS_MCOPY_PROBLEM 0x20 +#define PXENV_STATUS_BIS_INTEGRITY_FAILURE 0x21 +#define PXENV_STATUS_BIS_VALIDATE_FAILURE 0x22 +#define PXENV_STATUS_BIS_INIT_FAILURE 0x23 +#define PXENV_STATUS_BIS_SHUTDOWN_FAILURE 0x24 +#define PXENV_STATUS_BIS_GBOA_FAILURE 0x25 +#define PXENV_STATUS_BIS_FREE_FAILURE 0x26 +#define PXENV_STATUS_BIS_GSI_FAILURE 0x27 +#define PXENV_STATUS_BIS_BAD_CKSUM 0x28 + +/* TFTP/MTFTP errors (0x30 to 0x3f) */ +#define PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS 0x30 +#define PXENV_STATUS_TFTP_OPEN_TIMEOUT 0x32 +#define PXENV_STATUS_TFTP_UNKNOWN_OPCODE 0x33 +#define PXENV_STATUS_TFTP_READ_TIMEOUT 0x35 +#define PXENV_STATUS_TFTP_ERROR_OPCODE 0x36 +#define PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION 0x38 +#define PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION 0x39 +#define PXENV_STATUS_TFTP_TOO_MANY_PACKAGES 0x3a +#define PXENV_STATUS_TFTP_FILE_NOT_FOUND 0x3b +#define PXENV_STATUS_TFTP_ACCESS_VIOLATION 0x3c +#define PXENV_STATUS_TFTP_NO_MCAST_ADDRESS 0x3d +#define PXENV_STATUS_TFTP_NO_FILESIZE 0x3e +#define PXENV_STATUS_TFTP_INVALID_PACKET_SIZE 0x3f + +/* Reserved errors (0x40 to 0x4f) */ + +/* DHCP/BOOTP errors (0x50 to 0x5f) */ +#define PXENV_STATUS_DHCP_TIMEOUT 0x51 +#define PXENV_STATUS_DHCP_NO_IP_ADDRESS 0x52 +#define PXENV_STATUS_DHCP_NO_BOOTFILE_NAME 0x53 +#define PXENV_STATUS_DHCP_BAD_IP_ADDRESS 0x54 + +/* Driver errors (0x60 to 0x6f) */ +/* These errors are for UNDI compatible NIC drivers */ +#define PXENV_STATUS_UNDI_INVALID_FUNCTION 0x60 +#define PXENV_STATUS_UNDI_MEDIATEST_FAILED 0x61 +#define PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST 0x62 +#define PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC 0x63 +#define PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY 0x64 +#define PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA 0x65 +#define PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA 0x66 +#define PXENV_STATUS_UNDI_BAD_MAC_ADDRESS 0x67 +#define PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM 0x68 +#define PXENV_STATUS_UNDI_ERROR_SETTING_ISR 0x69 +#define PXENV_STATUS_UNDI_INVALID_STATE 0x6a +#define PXENV_STATUS_UNDI_TRANSMIT_ERROR 0x6b +#define PXENV_STATUS_UNDI_INVALID_PARAMETER 0x6c + +/* ROM and NBP bootstrap errors (0x70 to 0x7f) */ +#define PXENV_STATUS_BSTRAP_PROMPT_MENU 0x74 +#define PXENV_STATUS_BSTRAP_MCAST_ADDR 0x76 +#define PXENV_STATUS_BSTRAP_MISSING_LIST 0x77 +#define PXENV_STATUS_BSTRAP_NO_RESPONSE 0x78 +#define PXENV_STATUS_BSTRAP_FILE_TOO_BIG 0x79 + +/* Environment NBP errors (0x80 to 0x8f) */ + +/* Reserved errors (0x90 to 0x9f) */ + +/* Misc. errors (0xa0 to 0xaf) */ +#define PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE 0xa0 +#define PXENV_STATUS_BINL_NO_PXE_SERVER 0xa1 +#define PXENV_STATUS_NOT_AVAILABLE_IN_PMODE 0xa2 +#define PXENV_STATUS_NOT_AVAILABLE_IN_RMODE 0xa3 + +/* BUSD errors (0xb0 to 0xbf) */ +#define PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED 0xb0 + +/* Loader errors (0xc0 to 0xcf) */ +#define PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY 0xc0 +#define PXENV_STATUS_LOADER_NO_BC_ROMID 0xc1 +#define PXENV_STATUS_LOADER_BAD_BC_ROMID 0xc2 +#define PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE 0xc3 +#define PXENV_STATUS_LOADER_NO_UNDI_ROMID 0xc4 +#define PXENV_STATUS_LOADER_BAD_UNDI_ROMID 0xc5 +#define PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE 0xc6 +#define PXENV_STATUS_LOADER_NO_PXE_STRUCT 0xc8 +#define PXENV_STATUS_LOADER_NO_PXENV_STRUCT 0xc9 +#define PXENV_STATUS_LOADER_UNDI_START 0xca +#define PXENV_STATUS_LOADER_BC_START 0xcb + +/* Vendor errors (0xd0 to 0xff) */ + +/* PXENV API services */ +#define PXENV_START_UNDI 0x00 +#define PXENV_UNDI_STARTUP 0x01 +#define PXENV_UNDI_CLEANUP 0x02 +#define PXENV_UNDI_INITIALIZE 0x03 +#define PXENV_UNDI_RESET_ADAPTER 0x04 +#define PXENV_UNDI_SHUTDOWN 0x05 +#define PXENV_UNDI_OPEN 0x06 +#define PXENV_UNDI_CLOSE 0x07 +#define PXENV_UNDI_TRANSMIT 0x08 +#define PXENV_UNDI_SET_MCAST_ADDRESS 0x09 +#define PXENV_UNDI_SET_STATION_ADDRESS 0x0a +#define PXENV_UNDI_SET_PACKET_FILTER 0x0b +#define PXENV_UNDI_GET_INFORMATION 0x0c +#define PXENV_UNDI_GET_STATISTICS 0x0d +#define PXENV_UNDI_CLEAR_STATISTICS 0x0e +#define PXENV_UNDI_INITIATE_DIAGS 0x0f +#define PXENV_UNDI_FORCE_INTERRUPT 0x10 +#define PXENV_UNDI_GET_MCAST_ADDRESS 0x11 +#define PXENV_UNDI_GET_NIC_TYPE 0x12 +#define PXENV_UNDI_GET_IFACE_INFO 0x13 +#define PXENV_UNDI_ISR 0x14 +#define PXENV_UNDI_GET_STATE 0x15 +#define PXENV_STOP_UNDI 0x15 +#define PXENV_TFTP_OPEN 0x20 +#define PXENV_TFTP_CLOSE 0x21 +#define PXENV_TFTP_READ 0x22 +#define PXENV_TFTP_READ_FILE 0x23 +#define PXENV_TFTP_GET_FSIZE 0x25 +#define PXENV_UDP_OPEN 0x30 +#define PXENV_UDP_CLOSE 0x31 +#define PXENV_UDP_READ 0x32 +#define PXENV_UDP_WRITE 0x33 +#define PXENV_UNLOAD_STACK 0x70 +#define PXENV_GET_CACHED_INFO 0x71 +#define PXENV_RESTART_TFTP 0x73 +#define PXENV_START_BASE 0x75 +#define PXENV_STOP_BASE 0x76 + +#endif Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sun May 1 08:11:43 2011 @@ -69,6 +69,7 @@ #include <fs/fat.h> #include <fs/ntfs.h> #include <fs/iso.h> +#include <fs/pxe.h> /* ui support */ #include <ui/gui.h> #include <ui/minitui.h> @@ -83,6 +84,7 @@ #include <arch/i386/machpc.h> #include <arch/i386/machxbox.h> #include <arch/i386/miscboot.h> +#include <arch/i386/pxe.h> #include <internal/i386/intrin_i.h> #elif defined(_M_PPC) #include <arch/powerpc/hardware.h> Added: trunk/reactos/boot/freeldr/freeldr/include/fs/pxe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/pxe.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/pxe.h [iso-8859-1] Sun May 1 08:11:43 2011 @@ -1,0 +1,27 @@ +/* + * FreeLoader PXE support + * Copyright (C) 2011 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __PXE_H +#define __PXE_H + +const DEVVTBL* PxeMount(ULONG DeviceId); + +BOOLEAN PxeInit(VOID); + +#endif /* #defined __PXE_H */ Propchange: trunk/reactos/boot/freeldr/freeldr/include/fs/pxe.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 51516: [freeldr] ramdisk: allocate memory with right type This fixes NT boot type with a ramdisk, but ntoskrnl part is still broken
by hpoussin＠svn.reactos.org 01 May '11

01 May '11

Author: hpoussin Date: Sun May 1 08:01:05 2011 New Revision: 51516 URL: http://svn.reactos.org/svn/reactos?rev=51516&view=rev Log: [freeldr] ramdisk: allocate memory with right type This fixes NT boot type with a ramdisk, but ntoskrnl part is still broken Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sun May 1 08:01:05 2011 @@ -168,7 +168,7 @@ Percent = PercentPerChunk = 0; else Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); - gRamDiskBase = MmAllocateMemory(gRamDiskSize); + gRamDiskBase = MmAllocateMemoryWithType(gRamDiskSize, LoaderXIPRom); if (!gRamDiskBase) { UiMessageBox("Failed to allocate memory for RAM disk\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011