Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[hpoussin] 31180: Get SeRestorePrivilege before calling RegLoadKey

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Dec 12 14:41:38 2007 New Revision: 31180 URL: http://svn.reactos.org/svn/reactos?rev=31180&view=rev Log: Get SeRestorePrivilege before calling RegLoadKey Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c (original) +++ trunk/reactos/dll/win32/userenv/profile.c Wed Dec 12 14:41:38 2007 @@ -1,6 +1,5 @@ /* * ReactOS kernel - * Copyright (C) 2004 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,13 +15,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/profile.c * PURPOSE: User profile code - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Hervé Poussineau */ #include <precomp.h> @@ -98,6 +97,67 @@ RtlFreeUnicodeString (&UserName); return bResult; +} + + +static BOOL +AcquireRemoveRestorePrivilege( + IN BOOL bAcquire) +{ + HANDLE Process; + HANDLE Token; + PTOKEN_PRIVILEGES TokenPriv; + BOOL bRet; + + DPRINT("AcquireRemoveRestorePrivilege(%d)\n", bAcquire); + + Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); + if (!Process) + { + DPRINT1("OpenProcess() failed with error %lu\n", GetLastError()); + return FALSE; + } + bRet = OpenProcessToken(Process, TOKEN_ADJUST_PRIVILEGES, &Token); + CloseHandle(Process); + if (!bRet) + { + DPRINT1("OpenProcessToken() failed with error %lu\n", GetLastError()); + return FALSE; + } + TokenPriv = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges) + sizeof(LUID_AND_ATTRIBUTES)); + if (!TokenPriv) + { + DPRINT1("Failed to allocate mem for token privileges\n"); + CloseHandle(Token); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + TokenPriv->PrivilegeCount = 1; + TokenPriv->Privileges[0].Attributes = bAcquire ? SE_PRIVILEGE_ENABLED : 0; + if (!LookupPrivilegeValue(NULL, SE_RESTORE_NAME, &TokenPriv->Privileges[0].Luid)) + { + DPRINT1("LookupPrivilegeValue() failed with error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, TokenPriv); + CloseHandle(Token); + return FALSE; + } + bRet = AdjustTokenPrivileges( + Token, + FALSE, + TokenPriv, + 0, + NULL, + NULL); + HeapFree(GetProcessHeap(), 0, TokenPriv); + CloseHandle(Token); + + if (!bRet) + { + DPRINT1("AdjustTokenPrivileges() failed with error %lu\n", GetLastError()); + return FALSE; + } + + return TRUE; } @@ -285,10 +345,19 @@ wcscpy (szBuffer, szUserProfilePath); wcscat (szBuffer, L"\\ntuser.dat"); + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); + return FALSE; + } + /* Create new user hive */ Error = RegLoadKeyW (HKEY_USERS, SidString, szBuffer); + AcquireRemoveRestorePrivilege(FALSE); if (Error != ERROR_SUCCESS) { DPRINT1("Error: %lu\n", Error); @@ -967,10 +1036,18 @@ } ret = FALSE; + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError()); + goto cleanup; + } + /* Load user registry hive */ Error = RegLoadKeyW(HKEY_USERS, SidString.Buffer, szUserHivePath); + AcquireRemoveRestorePrivilege(FALSE); if (Error != ERROR_SUCCESS) { DPRINT1("RegLoadKeyW() failed (Error %ld)\n", Error);

16 years, 9 months

[cwittich] 31179: only clear it when the buffer is valid

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 12 12:17:59 2007 New Revision: 31179 URL: http://svn.reactos.org/svn/reactos?rev=31179&view=rev Log: only clear it when the buffer is valid Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Wed Dec 12 12:17:59 2007 @@ -29,13 +29,14 @@ /* Return a block of memory from the ARC Hardware Heap */ Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; - /* Clear it */ - RtlZeroMemory(Buffer, Size); - /* Increment the heap location */ FldrpHwHeapLocation += Size; if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; - + + /* Clear it */ + if (Buffer) + RtlZeroMemory(Buffer, Size); + /* Return the buffer */ return Buffer; }

16 years, 9 months

[winesync] 31178: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Dec 12 11:52:08 2007 New Revision: 31178 URL: http://svn.reactos.org/svn/reactos?rev=31178&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/dsa.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.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 (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed Dec 12 11:52:08 2007 @@ -82,15 +82,6 @@ } /****************************************************************************** -@@ -3521,6 +3525,8 @@ - * from which to switch to the next page */ - SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0); - -+ PROPSHEET_UnChanged(hwnd, (HWND)wParam); -+ - return TRUE; - } - Index: tooltips.c =================================================================== --- tooltips.c (revision 25790) @@ -143,54 +134,3 @@ if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); -@@ -4160,6 +4158,22 @@ - static LRESULT - TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) - { -+ TVHITTESTINFO ht; -+ -+ ht.pt = *pPt; -+ -+ TREEVIEW_HitTest(infoPtr, &ht); -+ -+ if (ht.hItem) -+ { -+ /* Change to screen coordinate for WM_CONTEXTMENU */ -+ ClientToScreen(infoPtr->hwnd, &ht.pt); -+ -+ /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ -+ SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, -+ (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); -+ } -+ - return 0; - } - -Index: monthcal.c -=================================================================== ---- monthcal.c (revision 29360) -+++ monthcal.c (working copy) -@@ -1719,11 +1719,12 @@ - - - static LRESULT --MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr) -+MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr, HWND hFocusWnd) - { - TRACE("\n"); - -- InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); -+ if (infoPtr->hwndNotify != hFocusWnd) -+ ShowWindow(infoPtr->hwndSelf, SW_HIDE); - - return 0; - } -@@ -2031,7 +2032,7 @@ - return DLGC_WANTARROWS | DLGC_WANTCHARS; - - case WM_KILLFOCUS: -- return MONTHCAL_KillFocus(infoPtr); -+ return MONTHCAL_KillFocus(infoPtr, wParam); - - case WM_RBUTTONDOWN: - return MONTHCAL_RButtonDown(infoPtr, lParam); Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32undoc.c (original) +++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c Wed Dec 12 11:52:08 2007 @@ -834,8 +834,8 @@ const WINEMRUITEM *witem; INT desired, datasize; + if ((nItemPos < 0) || !lpBuffer) return mp->cursize; if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; desired = mp->realMRU[nItemPos]; desired -= 'a'; TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); @@ -860,8 +860,8 @@ INT desired, datasize; DWORD lenA; + if ((nItemPos < 0) || !lpBuffer) return mp->cursize; if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; desired = mp->realMRU[nItemPos]; desired -= 'a'; TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c Wed Dec 12 11:52:08 2007 @@ -343,7 +343,7 @@ else { /* menu item was selected */ if (HIWORD(wParam) & MF_POPUP) - uMenuID = (UINT)*(lpwIDs+1); + uMenuID = *(lpwIDs+1); else uMenuID = (UINT)LOWORD(wParam); TRACE("uMenuID = %u\n", uMenuID); Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dpa.c (original) +++ trunk/reactos/dll/win32/comctl32/dpa.c Wed Dec 12 11:52:08 2007 @@ -443,7 +443,7 @@ /* create a new pointer array */ nNewItems = hdpaTemp->nGrow * - ((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); + (((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); nSize = nNewItems * sizeof(LPVOID); hdpaTemp->ptrs = HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize); hdpaTemp->nMaxCount = nNewItems; @@ -583,7 +583,7 @@ if (hdpa->nMaxCount <= i) { /* resize the block of memory */ INT nNewItems = - hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1); + hdpa->nGrow * ((((i+1) - 1) / hdpa->nGrow) + 1); INT nSize = nNewItems * sizeof(LPVOID); if (hdpa->ptrs) @@ -654,7 +654,7 @@ return NULL; hdpa->nMaxCount = nNewItems; - hdpa->ptrs = (LPVOID*)lpDest; + hdpa->ptrs = lpDest; } return lpTemp; Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dsa.c (original) +++ trunk/reactos/dll/win32/comctl32/dsa.c Wed Dec 12 11:52:08 2007 @@ -211,7 +211,7 @@ else { /* resize the block of memory */ nNewItems = - hdsa->nGrow * ((INT)(((nIndex + 1) - 1) / hdsa->nGrow) + 1); + hdsa->nGrow * ((((nIndex + 1) - 1) / hdsa->nGrow) + 1); nSize = hdsa->nItemSize * nNewItems; lpTemp = ReAlloc (hdsa->pData, nSize); Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c (original) +++ trunk/reactos/dll/win32/comctl32/header.c Wed Dec 12 11:52:08 2007 @@ -981,7 +981,7 @@ int height, width; HFONT hFont; - if (wParam < 0 || wParam >= infoPtr->uNumItem) + if (wParam >= infoPtr->uNumItem) return FALSE; if (!infoPtr->bRectsValid) 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 (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Wed Dec 12 11:52:08 2007 @@ -944,7 +944,7 @@ return result; } -static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd) +static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) { if (lpnmlvcd->clrTextBk == CLR_DEFAULT) lpnmlvcd->clrTextBk = comctl32_color.clrWindow; @@ -952,18 +952,21 @@ lpnmlvcd->clrText = comctl32_color.clrWindowText; /* apprently, for selected items, we have to override the returned values */ - if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) - { - if (infoPtr->bFocus) - { - lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; - lpnmlvcd->clrText = comctl32_color.clrHighlightText; + if (!SubItem) + { + if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) + { + if (infoPtr->bFocus) + { + lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; + lpnmlvcd->clrText = comctl32_color.clrHighlightText; + } + else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) + { + lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; + lpnmlvcd->clrText = comctl32_color.clrBtnText; + } } - else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) - { - lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; - lpnmlvcd->clrText = comctl32_color.clrBtnText; - } } /* Set the text attributes */ @@ -3787,7 +3790,9 @@ if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; } if (nSubItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) - prepaint_setup(infoPtr, hdc, &nmlvcd); + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) + prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); /* in full row select, subitems, will just use main item's colors */ if (nSubItem && uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) @@ -3930,7 +3935,7 @@ if (!(cditemmode & CDRF_SKIPDEFAULT)) { - prepaint_setup (infoPtr, hdc, &nmlvcd); + prepaint_setup (infoPtr, hdc, &nmlvcd, FALSE); SendMessageW(infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } @@ -4118,7 +4123,7 @@ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); if (cdmode & CDRF_SKIPDEFAULT) goto enddraw; - prepaint_setup(infoPtr, hdc, &nmlvcd); + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); /* Use these colors to draw the items */ infoPtr->clrTextBk = nmlvcd.clrTextBk; @@ -5040,12 +5045,12 @@ BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL); LVFINDINFOW fiw; INT res; - LPWSTR strW; + LPWSTR strW = NULL; memcpy(&fiw, lpFindInfo, sizeof(fiw)); if (hasText) fiw.psz = strW = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE); res = LISTVIEW_FindItemW(infoPtr, nStart, &fiw); - if (hasText) textfreeT(strW, FALSE); + textfreeT(strW, FALSE); return res; } Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c Wed Dec 12 11:52:08 2007 @@ -1725,6 +1725,8 @@ if (infoPtr->hwndNotify != hFocusWnd) ShowWindow(infoPtr->hwndSelf, SW_HIDE); + else + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } @@ -2032,7 +2034,7 @@ return DLGC_WANTARROWS | DLGC_WANTCHARS; case WM_KILLFOCUS: - return MONTHCAL_KillFocus(infoPtr, wParam); + return MONTHCAL_KillFocus(infoPtr, (HWND)wParam); case WM_RBUTTONDOWN: return MONTHCAL_RButtonDown(infoPtr, lParam); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Wed Dec 12 11:52:08 2007 @@ -1527,7 +1527,7 @@ if ((psInfo->ppshheader.dwFlags & PSH_WATERMARK) && !(psInfo->ppshheader.dwFlags & PSH_USEHBMWATERMARK)) { - ((PropSheetInfo *)psInfo)->ppshheader.u4.hbmWatermark = + psInfo->ppshheader.u4.hbmWatermark = CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u4.pszbmWatermark, 0, NULL, 0); } @@ -1535,7 +1535,7 @@ if ((psInfo->ppshheader.dwFlags & PSH_HEADER) && !(psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER)) { - ((PropSheetInfo *)psInfo)->ppshheader.u5.hbmHeader = + psInfo->ppshheader.u5.hbmHeader = CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u5.pszbmHeader, 0, NULL, 0); } } @@ -2081,7 +2081,7 @@ index = PROPSHEET_FindPageByResId(psInfo, result); if(index >= psInfo->nPages) { index = old_index; - WARN("Tried to skip to nonexistant page by res id\n"); + WARN("Tried to skip to nonexistent page by res id\n"); break; } continue; 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 (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c Wed Dec 12 11:52:08 2007 @@ -2797,7 +2797,7 @@ static LRESULT REBAR_PushChevron(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - if (wParam >= 0 && (UINT)wParam < infoPtr->uNumBands) + if ((UINT)wParam < infoPtr->uNumBands) { NMREBARCHEVRON nmrbc; REBAR_BAND *lpBand = &infoPtr->bands[wParam]; Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c Wed Dec 12 11:52:08 2007 @@ -3190,7 +3190,7 @@ (LPWSTR)RT_DIALOG))) return FALSE; - if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes))) + if(!(template = LoadResource (COMCTL32_hModule, hRes))) return FALSE; ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), @@ -5893,7 +5893,7 @@ infoPtr->nButtonDown = -1; /* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */ - TOOLBAR_SendNotify ((NMHDR *) &hdr, infoPtr, + TOOLBAR_SendNotify (&hdr, infoPtr, NM_RELEASEDCAPTURE); /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c Wed Dec 12 11:52:08 2007 @@ -1109,7 +1109,7 @@ if (IS_INTRESOURCE(lpToolInfo->lpszText)) { TRACE("add string id %x\n", LOWORD(lpToolInfo->lpszText)); - toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText; + toolPtr->lpszText = lpToolInfo->lpszText; } else if (lpToolInfo->lpszText) { if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) { Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Wed Dec 12 11:52:08 2007 @@ -811,7 +811,7 @@ ClientToScreen(infoPtr->hwndSelf, &pt); SendMessageW (infoPtr->hwndToolTip, TTM_TRACKPOSITION, - 0, (LPARAM)MAKELPARAM(pt.x, pt.y)); + 0, MAKELPARAM(pt.x, pt.y)); } Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Dec 12 11:52:08 2007 @@ -3994,7 +3994,7 @@ if(ht.hItem && (ht.flags & TVHT_ONITEM)) { infoPtr->focusedItem = ht.hItem; - InvalidateRect(hwnd, &(((HTREEITEM)(ht.hItem))->rect), TRUE); + InvalidateRect(hwnd, &ht.hItem->rect, TRUE); if(infoPtr->selectedItem) InvalidateRect(hwnd, &(infoPtr->selectedItem->rect), TRUE); @@ -4173,7 +4173,6 @@ SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); } - return 0; }

16 years, 9 months

[arty] 31177: Add simple hardware.h for ppc.

by arty＠svn.reactos.org

Author: arty Date: Wed Dec 12 10:43:07 2007 New Revision: 31177 URL: http://svn.reactos.org/svn/reactos?rev=31177&view=rev Log: Add simple hardware.h for ppc. Added: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/ trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h (with props) Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Added: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h Wed Dec 12 10:43:07 2007 @@ -1,0 +1,94 @@ +/* + * FreeLoader + * + * Copyright (C) 2003 Eric Kohl + * + * 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 __POWERPC_HARDWARE_H_ +#define __POWERPC_HARDWARE_H_ + +#ifndef __REGISTRY_H +#include "../../reactos/registry.h" +#endif + +#define CONFIG_CMD(bus, dev_fn, where) \ + (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) + +// +// Static heap for ARC Hardware Component Tree +// 16KB oughta be enough for anyone. +// +#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 + +// +// ARC Component Configuration Routines +// +VOID +NTAPI +FldrSetComponentInformation( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN IDENTIFIER_FLAG Flags, + IN ULONG Key, + IN ULONG Affinity +); + +VOID +NTAPI +FldrSetIdentifier( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN PWCHAR Identifier +); + +VOID +NTAPI +FldrCreateSystemKey( + OUT PCONFIGURATION_COMPONENT_DATA *SystemKey +); + +VOID +NTAPI +FldrCreateComponentKey( + IN PCONFIGURATION_COMPONENT_DATA SystemKey, + IN PWCHAR BusName, + IN ULONG BusNumber, + IN CONFIGURATION_CLASS Class, + IN CONFIGURATION_TYPE Type, + OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey +); + +VOID +NTAPI +FldrSetConfigurationData( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN PVOID ConfigurationData, + IN ULONG Size +); + + +/* PROTOTYPES ***************************************************************/ + +/* hardware.c */ + +VOID StallExecutionProcessor(ULONG Microseconds); + +VOID HalpCalibrateStallExecution(VOID); + +ULONGLONG RDTSC(VOID); + +#endif /* __POWERPC_HARDWARE_H_ */ + +/* EOF */ Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.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 (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Wed Dec 12 10:43:07 2007 @@ -69,6 +69,8 @@ #include <arch/i386/machxbox.h> #include <internal/i386/intrin_i.h> #include <internal/i386/ke.h> +#elif _PPC_ +#include <arch/powerpc/hardware.h> #elif _MIPS_ #include <arch/mips/arcbios.h> #endif

16 years, 9 months

[weiden] 31176: Add support for trustees with objects (building object ACEs is not yet implemented)

by weiden＠svn.reactos.org

Author: weiden Date: Wed Dec 12 10:04:12 2007 New Revision: 31176 URL: http://svn.reactos.org/svn/reactos?rev=31176&view=rev Log: Add support for trustees with objects (building object ACEs is not yet implemented) Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Wed Dec 12 10:04:12 2007 @@ -186,6 +186,74 @@ return Ret; } +static DWORD +AccpGetTrusteeObjects(IN PTRUSTEE_W Trustee, + OUT GUID *pObjectTypeGuid OPTIONAL, + OUT GUID *pInheritedObjectTypeGuid OPTIONAL) +{ + DWORD Ret; + + switch (Trustee->TrusteeForm) + { + case TRUSTEE_IS_OBJECTS_AND_NAME: + { + POBJECTS_AND_NAME_W pOan = (POBJECTS_AND_NAME_W)Trustee->ptstrName; + + /* pOan->ObjectsPresent should always be 0 here because a previous + call to AccpGetTrusteeSid should have rejected these trustees + already. */ + ASSERT(pOan->ObjectsPresent == 0); + + Ret = pOan->ObjectsPresent; + break; + } + + case TRUSTEE_IS_OBJECTS_AND_SID: + { + POBJECTS_AND_SID pOas = (POBJECTS_AND_SID)Trustee->ptstrName; + + if (pObjectTypeGuid != NULL && pOas->ObjectsPresent & ACE_OBJECT_TYPE_PRESENT) + *pObjectTypeGuid = pOas->ObjectTypeGuid; + + if (pInheritedObjectTypeGuid != NULL && pOas->ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) + *pObjectTypeGuid = pOas->InheritedObjectTypeGuid; + + Ret = pOas->ObjectsPresent; + break; + } + + default: + /* Any other trustee forms have no objects attached... */ + Ret = 0; + break; + } + + return Ret; +} + +static DWORD +AccpCalcNeededAceSize(IN PSID Sid, + IN DWORD ObjectsPresent) +{ + DWORD Ret; + + Ret = sizeof(ACE) + GetLengthSid(Sid); + + /* This routine calculates the generic size of the ACE needed. + If no objects are present it is assumed that only a standard + ACE is to be created. */ + + if (ObjectsPresent & ACE_OBJECT_TYPE_PRESENT) + Ret += sizeof(GUID); + if (ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) + Ret += sizeof(GUID); + + if (ObjectsPresent != 0) + Ret += sizeof(DWORD); /* Include the Flags member to make it an object ACE */ + + return Ret; +} + static GUID* AccpGetObjectAceObjectType(IN PACE_HEADER AceHeader) { @@ -411,14 +479,23 @@ if (Trustee->pMultipleTrustee || Trustee->MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) { - DPRINT1("Trustee form not supported\n"); + /* This is currently not supported */ return ERROR_INVALID_PARAMETER; } switch (Trustee->TrusteeForm) { + case TRUSTEE_IS_OBJECTS_AND_NAME: + if (((POBJECTS_AND_NAME_W)Trustee->ptstrName)->ObjectsPresent != 0) + { + /* This is not supported as there is no way to interpret the + strings provided, and we need GUIDs for the ACEs... */ + Ret = ERROR_INVALID_PARAMETER; + break; + } + /* fall through */ + case TRUSTEE_IS_NAME: - case TRUSTEE_IS_OBJECTS_AND_NAME: if (*pPolicyHandle == NULL) { Ret = AccpOpenLSAPolicyHandle(NULL, /* FIXME - always local? */ @@ -449,7 +526,6 @@ break; default: - DPRINT1("Wrong Trustee form\n"); Ret = ERROR_INVALID_PARAMETER; break; } @@ -1154,7 +1230,10 @@ PACL pNew = NULL; ACL_SIZE_INFORMATION SizeInformation; PACE_HEADER pAce; + BOOLEAN KeepAceBuf[8]; BOOLEAN *pKeepAce = NULL; + GUID ObjectTypeGuid, InheritedObjectTypeGuid; + DWORD ObjectsPresent; BOOL needToClean; PSID pSid1, pSid2; ULONG i; @@ -1177,12 +1256,17 @@ goto Cleanup; } - pKeepAce = (BOOLEAN *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount * sizeof(*pKeepAce)); - if (!pKeepAce) - { - Ret = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } + if (SizeInformation.AceCount > sizeof(KeepAceBuf) / sizeof(KeepAceBuf[0])) + { + pKeepAce = (BOOLEAN *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount * sizeof(*pKeepAce)); + if (!pKeepAce) + { + Ret = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + } + else + pKeepAce = KeepAceBuf; memset(pKeepAce, TRUE, SizeInformation.AceCount * sizeof(*pKeepAce)); } @@ -1201,6 +1285,10 @@ &needToClean); if (Ret != ERROR_SUCCESS) goto Cleanup; + + ObjectsPresent = AccpGetTrusteeObjects(&pListOfExplicitEntries[i].Trustee, + NULL, + NULL); switch (pListOfExplicitEntries[i].grfAccessMode) { @@ -1228,12 +1316,9 @@ break; /* ...and replace by the current access */ case GRANT_ACCESS: - /* Add to ACL */ - SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(pSid1); - break; case DENY_ACCESS: /* Add to ACL */ - SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + RtlLengthSid(pSid1); + SizeInformation.AclBytesInUse += AccpCalcNeededAceSize(pSid1, ObjectsPresent); break; case SET_AUDIT_SUCCESS: case SET_AUDIT_FAILURE: @@ -1283,7 +1368,23 @@ if (Ret != ERROR_SUCCESS) goto Cleanup; - bRet = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + ObjectsPresent = AccpGetTrusteeObjects(&pListOfExplicitEntries[i].Trustee, + &ObjectTypeGuid, + &InheritedObjectTypeGuid); + + if (ObjectsPresent == 0) + { + /* FIXME: Call AddAccessDeniedAceEx instead! */ + bRet = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + } + else + { + /* FIXME: Call AddAccessDeniedObjectAce */ + DPRINT1("Object ACEs not yet supported!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + bRet = FALSE; + } + if (needToClean) LocalFree((HLOCAL)pSid1); if (!bRet) { @@ -1310,7 +1411,23 @@ if (Ret != ERROR_SUCCESS) goto Cleanup; - bRet = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + ObjectsPresent = AccpGetTrusteeObjects(&pListOfExplicitEntries[i].Trustee, + &ObjectTypeGuid, + &InheritedObjectTypeGuid); + + if (ObjectsPresent == 0) + { + /* FIXME: Call AddAccessAllowedAceEx instead! */ + bRet = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + } + else + { + /* FIXME: Call AddAccessAllowedObjectAce */ + DPRINT1("Object ACEs not yet supported!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + bRet = FALSE; + } + if (needToClean) LocalFree((HLOCAL)pSid1); if (!bRet) { @@ -1326,7 +1443,7 @@ *NewAcl = pNew; Cleanup: - if (pKeepAce) + if (pKeepAce && pKeepAce != KeepAceBuf) LocalFree((HLOCAL)pKeepAce); if (pNew && Ret != ERROR_SUCCESS)

16 years, 9 months

[jimtabor] 31175: Temporarily implement GWL_HWNDPARENT in user mode.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 12 09:12:02 2007 New Revision: 31175 URL: http://svn.reactos.org/svn/reactos?rev=31175&view=rev Log: Temporarily implement GWL_HWNDPARENT in user mode. Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Wed Dec 12 09:12:02 2007 @@ -529,6 +529,11 @@ case GWL_HWNDPARENT: DbgPrint("GWL_HWNDPARENT\n"); /* FIXME: Implement in user32 */ + { + HWND parent = GetAncestor( hWnd, GA_PARENT ); + if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); + return (LONG)parent; + } case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */ @@ -583,6 +588,11 @@ case GWL_HWNDPARENT: DbgPrint("GWL_HWNDPARENT\n"); /* FIXME: Implement in user32 */ + { + HWND parent = GetAncestor( hWnd, GA_PARENT ); + if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); + return (LONG)parent; + } case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */

16 years, 9 months

[jimtabor] 31174: A partial implementation of NtGdiCreate/DeleteClientObj.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 12 05:29:21 2007 New Revision: 31174 URL: http://svn.reactos.org/svn/reactos?rev=31174&view=rev Log: A partial implementation of NtGdiCreate/DeleteClientObj. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Wed Dec 12 05:29:21 2007 @@ -1509,8 +1509,13 @@ IN ULONG ulType ) { - UNIMPLEMENTED; - return 0; +// INT Index; +// PGDI_TABLE_ENTRY Entry; + HANDLE handle = GDIOBJ_AllocObj(GdiHandleTable, GDI_OBJECT_TAG_CLIOBJ); +// Need to change handle type based on ulType. +// Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)handle); +// Entry = &GdiHandleTable->Entries[Index]; + return handle; } W32KAPI @@ -1520,8 +1525,7 @@ IN HANDLE h ) { - UNIMPLEMENTED; - return 0; + return GDIOBJ_FreeObj(GdiHandleTable, h, GDI_OBJECT_TAG_CLIOBJ); } /* EOF */

16 years, 9 months

[janderwald] 31173: - move some hardcoded strings to header en-US.h - move PAGE_NUMBER to usetup.h - start multiple language input support for usetup

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Dec 12 03:05:00 2007 New Revision: 31173 URL: http://svn.reactos.org/svn/reactos?rev=31173&view=rev Log: - move some hardcoded strings to header en-US.h - move PAGE_NUMBER to usetup.h - start multiple language input support for usetup Added: trunk/reactos/base/setup/usetup/lang/ trunk/reactos/base/setup/usetup/lang/en-US.h (with props) trunk/reactos/base/setup/usetup/mui.c (with props) trunk/reactos/base/setup/usetup/mui.h (with props) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/usetup.h trunk/reactos/base/setup/usetup/usetup.rbuild Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Dec 12 03:05:00 2007 @@ -31,45 +31,6 @@ #define NDEBUG #include <debug.h> -typedef enum _PAGE_NUMBER -{ - START_PAGE, - INTRO_PAGE, - LICENSE_PAGE, - INSTALL_INTRO_PAGE, - -// SCSI_CONTROLLER_PAGE, - - DEVICE_SETTINGS_PAGE, - COMPUTER_SETTINGS_PAGE, - DISPLAY_SETTINGS_PAGE, - KEYBOARD_SETTINGS_PAGE, - LAYOUT_SETTINGS_PAGE, - - SELECT_PARTITION_PAGE, - CREATE_PARTITION_PAGE, - DELETE_PARTITION_PAGE, - - SELECT_FILE_SYSTEM_PAGE, - FORMAT_PARTITION_PAGE, - CHECK_FILE_SYSTEM_PAGE, - - PREPARE_COPY_PAGE, - INSTALL_DIRECTORY_PAGE, - FILE_COPY_PAGE, - REGISTRY_PAGE, - BOOT_LOADER_PAGE, - BOOT_LOADER_FLOPPY_PAGE, - BOOT_LOADER_HARDDISK_PAGE, - - REPAIR_INTRO_PAGE, - - SUCCESS_PAGE, - QUIT_PAGE, - FLUSH_PAGE, - REBOOT_PAGE, /* virtual page */ -} PAGE_NUMBER, *PPAGE_NUMBER; - /* GLOBALS ******************************************************************/ HANDLE ProcessHeap; @@ -137,10 +98,6 @@ } -#define POPUP_WAIT_NONE 0 -#define POPUP_WAIT_ANY_KEY 1 -#define POPUP_WAIT_ENTER 2 - static VOID DrawBox( IN SHORT xLeft, @@ -240,7 +197,7 @@ &Written); } -static VOID +VOID PopupError(PCHAR Text, PCHAR Status, PINPUT_RECORD Ir, @@ -722,20 +679,7 @@ static PAGE_NUMBER IntroPage(PINPUT_RECORD Ir) { - CONSOLE_SetHighlightedTextXY(6, 8, "Welcome to ReactOS Setup"); - - CONSOLE_SetTextXY(6, 11, "This part of the setup copies the ReactOS Operating System to your"); - CONSOLE_SetTextXY(6, 12, "computer and prepares the second part of the setup."); - - CONSOLE_SetTextXY(8, 15, "\x07 Press ENTER to install ReactOS."); - CONSOLE_SetTextXY(8, 17, "\x07 Press R to repair ReactOS."); - CONSOLE_SetTextXY(8, 19, "\x07 Press L to view the ReactOS Licensing Terms and Conditions"); - CONSOLE_SetTextXY(8, 21, "\x07 Press F3 to quit without installing ReactOS."); - - CONSOLE_SetTextXY(6, 23, "For more information on ReactOS, please visit:"); - CONSOLE_SetHighlightedTextXY(6, 24, "http://www.reactos.org"); - - CONSOLE_SetStatusText(" ENTER = Continue R = Repair F3 = Quit"); + MUIDisplayPage(INTRO_PAGE); if (IsUnattendedSetup) { @@ -787,32 +731,9 @@ static PAGE_NUMBER LicensePage(PINPUT_RECORD Ir) { - CONSOLE_SetHighlightedTextXY(6, 6, "Licensing:"); - - CONSOLE_SetTextXY(8, 8, "The ReactOS System is licensed under the terms of the"); - CONSOLE_SetTextXY(8, 9, "GNU GPL with parts containing code from other compatible"); - CONSOLE_SetTextXY(8, 10, "licenses such as the X11 or BSD and GNU LGPL licenses."); - CONSOLE_SetTextXY(8, 11, "All software that is part of the ReactOS system is"); - CONSOLE_SetTextXY(8, 12, "therefore released under the GNU GPL as well as maintaining"); - CONSOLE_SetTextXY(8, 13, "the original license."); - - CONSOLE_SetTextXY(8, 15, "This software comes with NO WARRANTY or restrictions on usage"); - CONSOLE_SetTextXY(8, 16, "save applicable local and international law. The licensing of"); - CONSOLE_SetTextXY(8, 17, "ReactOS only covers distribution to third parties."); - - CONSOLE_SetTextXY(8, 18, "If for some reason you did not receive a copy of the"); - CONSOLE_SetTextXY(8, 19, "GNU General Public License with ReactOS please visit"); - CONSOLE_SetHighlightedTextXY(8, 20, "http://www.gnu.org/licenses/licenses.html"); - - CONSOLE_SetHighlightedTextXY(6, 22, "Warranty:"); - - CONSOLE_SetTextXY(8, 24, "This is free software; see the source for copying conditions."); - CONSOLE_SetTextXY(8, 25, "There is NO warranty; not even for MERCHANTABILITY or"); - CONSOLE_SetTextXY(8, 26, "FITNESS FOR A PARTICULAR PURPOSE"); - - CONSOLE_SetStatusText(" ENTER = Return"); - - while (TRUE) + MUIDisplayPage(LICENSE_PAGE); + + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -829,20 +750,7 @@ static PAGE_NUMBER RepairIntroPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "ReactOS Setup is in an early development phase. It does not yet"); - CONSOLE_SetTextXY(6, 9, "support all the functions of a fully usable setup application."); - - CONSOLE_SetTextXY(6, 12, "The repair functions are not implemented yet."); - - CONSOLE_SetTextXY(8, 15, "\x07 Press U for Updating OS."); - - CONSOLE_SetTextXY(8, 17, "\x07 Press R for the Recovery Console."); - - CONSOLE_SetTextXY(8, 19, "\x07 Press ESC to return to the main page."); - - CONSOLE_SetTextXY(8, 21, "\x07 Press ENTER to reboot your computer."); - - CONSOLE_SetStatusText(" ESC = Main page ENTER = Reboot"); + MUIDisplayPage(REPAIR_INTRO_PAGE); while(TRUE) { @@ -875,27 +783,7 @@ static PAGE_NUMBER InstallIntroPage(PINPUT_RECORD Ir) { - CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); - - CONSOLE_SetTextXY(6, 8, "ReactOS Setup is in an early development phase. It does not yet"); - CONSOLE_SetTextXY(6, 9, "support all the functions of a fully usable setup application."); - - CONSOLE_SetTextXY(6, 12, "The following limitations apply:"); - CONSOLE_SetTextXY(8, 13, "- Setup can not handle more than one primary partition per disk."); - CONSOLE_SetTextXY(8, 14, "- Setup can not delete a primary partition from a disk"); - CONSOLE_SetTextXY(8, 15, " as long as extended partitions exist on this disk."); - CONSOLE_SetTextXY(8, 16, "- Setup can not delete the first extended partition from a disk"); - CONSOLE_SetTextXY(8, 17, " as long as other extended partitions exist on this disk."); - CONSOLE_SetTextXY(8, 18, "- Setup supports FAT file systems only."); - CONSOLE_SetTextXY(8, 19, "- File system checks are not implemented yet."); - - - CONSOLE_SetTextXY(8, 23, "\x07 Press ENTER to install ReactOS."); - - CONSOLE_SetTextXY(8, 25, "\x07 Press F3 to quit without installing ReactOS."); - - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + MUIDisplayPage(INTRO_PAGE); if (RepairUpdateFlag) { @@ -970,6 +858,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; + MUIDisplayPage(DEVICE_SETTINGS_PAGE); /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1024,34 +913,17 @@ } } - CONSOLE_SetTextXY(6, 8, "The list below shows the current device settings."); - - CONSOLE_SetTextXY(8, 11, " Computer:"); - CONSOLE_SetTextXY(8, 12, " Display:"); - CONSOLE_SetTextXY(8, 13, " Keyboard:"); - CONSOLE_SetTextXY(8, 14, "Keyboard layout:"); - - CONSOLE_SetTextXY(8, 16, " Accept:"); + MUIDisplayPage(DEVICE_SETTINGS_PAGE); + CONSOLE_SetTextXY(25, 11, GetGenericListEntry(ComputerList)->Text); CONSOLE_SetTextXY(25, 12, GetGenericListEntry(DisplayList)->Text); CONSOLE_SetTextXY(25, 13, GetGenericListEntry(KeyboardList)->Text); CONSOLE_SetTextXY(25, 14, GetGenericListEntry(LayoutList)->Text); - CONSOLE_SetTextXY(25, 16, "Accept these device settings"); CONSOLE_InvertTextXY (24, Line, 48, 1); - - CONSOLE_SetTextXY(6, 19, "You can change the hardware settings by pressing the UP or DOWN keys"); - CONSOLE_SetTextXY(6, 20, "to select an entry. Then press the ENTER key to select alternative"); - CONSOLE_SetTextXY(6, 21, "settings."); - - CONSOLE_SetTextXY(6, 23, "When all settings are correct, select \"Accept these device settings\""); - CONSOLE_SetTextXY(6, 24, "and press ENTER."); - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); - - if (RepairUpdateFlag) + if (RepairUpdateFlag) { return SELECT_PARTITION_PAGE; } @@ -1113,13 +985,7 @@ static PAGE_NUMBER ComputerSettingsPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "You want to change the type of computer to be installed."); - - CONSOLE_SetTextXY(8, 10, "\x07 Press the UP or DOWN key to select the desired computer type."); - CONSOLE_SetTextXY(8, 11, " Then press ENTER."); - - CONSOLE_SetTextXY(8, 13, "\x07 Press the ESC key to return to the previous page without changing"); - CONSOLE_SetTextXY(8, 14, " the computer type."); + MUIDisplayPage(COMPUTER_SETTINGS_PAGE); DrawGenericList(ComputerList, 2, @@ -1127,8 +993,6 @@ xScreen - 3, yScreen - 3); - CONSOLE_SetStatusText(" ENTER = Continue ESC = Cancel F3 = Quit"); - SaveGenericListState(ComputerList); while(TRUE) @@ -1171,21 +1035,13 @@ static PAGE_NUMBER DisplaySettingsPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "You want to change the type of display to be installed."); - - CONSOLE_SetTextXY(8, 10, "\x07 Press the UP or DOWN key to select the desired display type."); - CONSOLE_SetTextXY(8, 11, " Then press ENTER."); - - CONSOLE_SetTextXY(8, 13, "\x07 Press the ESC key to return to the previous page without changing"); - CONSOLE_SetTextXY(8, 14, " the display type."); + MUIDisplayPage(DISPLAY_SETTINGS_PAGE); DrawGenericList(DisplayList, 2, 18, xScreen - 3, yScreen - 3); - - CONSOLE_SetStatusText(" ENTER = Continue ESC = Cancel F3 = Quit"); SaveGenericListState(DisplayList); @@ -3441,14 +3297,8 @@ { NTSTATUS Status; - CONSOLE_SetTextXY(6, 8, "Setup cannot install the bootloader on your computers"); - CONSOLE_SetTextXY(6, 9, "harddisk"); - - CONSOLE_SetTextXY(6, 13, "Please insert a formatted floppy disk in drive A: and"); - CONSOLE_SetTextXY(6, 14, "press ENTER."); - - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + MUIDisplayPage(BOOT_LOADER_FLOPPY_PAGE); + // SetStatusText(" Please wait..."); while(TRUE) @@ -3531,14 +3381,7 @@ static PAGE_NUMBER QuitPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(10, 6, "ReactOS is not completely installed"); - - CONSOLE_SetTextXY(10, 8, "Remove floppy disk from Drive A: and"); - CONSOLE_SetTextXY(10, 9, "all CD-ROMs from CD-Drives."); - - CONSOLE_SetTextXY(10, 11, "Press ENTER to reboot your computer."); - - CONSOLE_SetStatusText(" Please wait ..."); + MUIDisplayPage(QUIT_PAGE); /* Destroy partition list */ if (PartitionList != NULL) @@ -3599,14 +3442,7 @@ static PAGE_NUMBER SuccessPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(10, 6, "The basic components of ReactOS have been installed successfully."); - - CONSOLE_SetTextXY(10, 8, "Remove floppy disk from Drive A: and"); - CONSOLE_SetTextXY(10, 9, "all CD-ROMs from CD-Drive."); - - CONSOLE_SetTextXY(10, 11, "Press ENTER to reboot your computer."); - - CONSOLE_SetStatusText(" ENTER = Reboot computer"); + MUIDisplayPage(SUCCESS_PAGE); if (IsUnattendedSetup) { @@ -3628,13 +3464,7 @@ static PAGE_NUMBER FlushPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(10, 6, "The system is now making sure all data is stored on your disk"); - - CONSOLE_SetTextXY(10, 8, "This may take a minute"); - CONSOLE_SetTextXY(10, 9, "When finished, your computer will reboot automatically"); - - CONSOLE_SetStatusText(" Flushing cache"); - + MUIDisplayPage(FLUSH_PAGE); return REBOOT_PAGE; } Added: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (added) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Dec 12 03:05:00 2007 @@ -1,0 +1,728 @@ +#ifndef LANG_EN_US_H__ +#define LANG_EN_US_H__ + +static MUI_ENTRY WelcomePageEntries[] = +{ + { + 6, + 8, + "Welcome to ReactOS Setup", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "This part of the setup copies the ReactOS Operating System to your", + TEXT_NORMAL + }, + { + 6, + 12, + "computer and prepares the second part of the setup.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press ENTER to install ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press R to repair ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Press L to view the ReactOS Licensing Terms and Conditions", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "For more information on ReactOS, please visit:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Continue R = Repair F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY IntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The following limitations apply:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Setup can not handle more than one primary partition per disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Setup can not delete a primary partition from a disk", + TEXT_NORMAL + }, + { + 8, + 15, + " as long as extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Setup can not delete the first extended partition from a disk", + TEXT_NORMAL + }, + { + 8, + 17, + " as long as other extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Setup supports FAT file systems only.", + TEXT_NORMAL + }, + { + 8, + 19, + "- File system checks are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Press ENTER to install ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY LicensePageEntries[] = +{ + { + 6, + 6, + "Licensing:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Return", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY DevicePageEntries[] = +{ + { + 6, + 8, + "The list below shows the current device settings.", + TEXT_NORMAL + }, + { + 8, + 11, + " Computer:", + TEXT_NORMAL + }, + { + 8, + 12, + " Display:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Keyboard:", + TEXT_NORMAL + }, + { + 8, + 14, + "Keyboard layout:", + TEXT_NORMAL + }, + { + 8, + 16, + " Accept:", + TEXT_NORMAL + }, + { + 25, + 16, "Accept these device settings", + TEXT_NORMAL + }, + { + 6, + 19, + "You can change the hardware settings by pressing the UP or DOWN keys", + TEXT_NORMAL + }, + { + 6, + 20, + "to select an entry. Then press the ENTER key to select alternative", + TEXT_NORMAL + }, + { + 6, + 21, + "settings.", + TEXT_NORMAL + }, + { + 6, + 23, + "When all settings are correct, select \"Accept these device settings\"", + TEXT_NORMAL + }, + { + 6, + 24, + "and press ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY RepairPageEntries[] = +{ + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The repair functions are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press U for Updating OS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press R for the Recovery Console.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to return to the main page.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Main page ENTER = Reboot", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY ComputerPageEntries[] = +{ + { + 6, + 8, + "You want to change the type of computer to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired computer type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the computer type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY FlushPageEntries[] = +{ + { + 10, + 6, + "The system is now making sure all data is stored on your disk", + TEXT_NORMAL + }, + { + 10, + 8, + "This may take a minute", + TEXT_NORMAL + }, + { + 10, + 9, + "When finished, your computer will reboot automatically", + TEXT_NORMAL + }, + { + 0, + 0, + " Flushing cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY QuitPageEntries[] = +{ + { + 10, + 6, + "ReactOS is not completely installed", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drives.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY DisplayPageEntries[] = +{ + { + 6, + 8, + "You want to change the type of display to be installed.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Press the UP or DOWN key to select the desired display type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the display type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY SuccessPageEntries[] = +{ + { + 10, + 6, + "The basic components of ReactOS have been installed successfully.", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drive.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Reboot computer", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY BootPageEntries[] = +{ + { + 6, + 8, + "Setup cannot install the bootloader on your computers", + TEXT_NORMAL + }, + { + 6, + 9, + "hardisk", + TEXT_NORMAL + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A: and", + TEXT_NORMAL + }, + { + 6, + 14, + "press ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +MUI_PAGE enUSPages[] = +{ + { + START_PAGE, + WelcomePageEntries + }, + { + INTRO_PAGE, + IntroPageEntries + }, + { + LICENSE_PAGE, + LicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + DevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + RepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + ComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + DisplayPageEntries + }, + { + FLUSH_PAGE, + FlushPageEntries + }, + { + QUIT_PAGE, + QuitPageEntries + }, + { + SUCCESS_PAGE, + SuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + BootPageEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/en-US.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (added) +++ trunk/reactos/base/setup/usetup/mui.c Wed Dec 12 03:05:00 2007 @@ -1,0 +1,83 @@ +#include "usetup.h" +#include "mui.h" + +#include "lang/en-US.h" + +static MUI_LANGUAGE lang[] = +{ + { + "English (USA)", + enUSPages + }, + { + NULL, + NULL + } +}; + +static unsigned sel_lang = 0; + +extern +VOID +PopupError(PCHAR Text, + PCHAR Status, + PINPUT_RECORD Ir, + ULONG WaitEvent); + + +static +MUI_ENTRY * +findMUIEntriesOfPage(int pg, MUI_PAGE * pages) +{ + int index = 0; + do + { + if (pages[index].Number == pg) + { + return pages[index].MuiEntry; + } + index++; + }while(pages[index].MuiEntry != NULL); + return NULL; +} + +void MUIDisplayPage(int pg) +{ + MUI_ENTRY * entry; + int index; + int flags; + + entry = findMUIEntriesOfPage(pg, lang[sel_lang].MuiPages); + if (!entry) + { + PopupError("Error: Failed to find translated page", + NULL, + NULL, + POPUP_WAIT_NONE); + return; + } + + index = 0; + do + { + flags = entry[index].Flags; + switch(flags) + { + case TEXT_NORMAL: + CONSOLE_SetTextXY(entry[index].X, entry[index].Y, entry[index].Buffer); + break; + case TEXT_HIGHLIGHT: + CONSOLE_SetHighlightedTextXY(entry[index].X, entry[index].Y, entry[index].Buffer); + break; + case TEXT_UNDERLINE: + CONSOLE_SetUnderlinedTextXY(entry[index].X, entry[index].Y, entry[index].Buffer); + break; + case TEXT_STATUS: + CONSOLE_SetStatusText(entry[index].Buffer); + break; + default: + break; + } + index++; + }while(entry[index].Buffer != NULL); +} Propchange: trunk/reactos/base/setup/usetup/mui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (added) +++ trunk/reactos/base/setup/usetup/mui.h Wed Dec 12 03:05:00 2007 @@ -1,0 +1,34 @@ +#ifndef MUI_H__ +#define MUI_H__ + +typedef struct +{ + BYTE X; + BYTE Y; + CHAR * Buffer; + BYTE Flags; +}MUI_ENTRY, *PMUI_ENTRY; + +typedef struct +{ + long Number; + MUI_ENTRY * MuiEntry; +}MUI_PAGE; + +typedef struct +{ + CHAR * LanguageDescriptor; + MUI_PAGE * MuiPages; +}MUI_LANGUAGE; + + +#define TEXT_NORMAL 0 +#define TEXT_HIGHLIGHT 1 +#define TEXT_UNDERLINE 2 +#define TEXT_STATUS 4 + + +void MUIDisplayPage(int pg); + + +#endif Propchange: trunk/reactos/base/setup/usetup/mui.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Wed Dec 12 03:05:00 2007 @@ -71,6 +71,8 @@ #include "genlist.h" #include "settings.h" #include "host.h" +#include "mui.h" + extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; @@ -78,6 +80,50 @@ extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; +typedef enum _PAGE_NUMBER +{ + START_PAGE = 0, + INTRO_PAGE, + LICENSE_PAGE, + INSTALL_INTRO_PAGE, + +// SCSI_CONTROLLER_PAGE, + + DEVICE_SETTINGS_PAGE, + COMPUTER_SETTINGS_PAGE, + DISPLAY_SETTINGS_PAGE, + KEYBOARD_SETTINGS_PAGE, + LAYOUT_SETTINGS_PAGE, + + SELECT_PARTITION_PAGE, + CREATE_PARTITION_PAGE, + DELETE_PARTITION_PAGE, + + SELECT_FILE_SYSTEM_PAGE, + FORMAT_PARTITION_PAGE, + CHECK_FILE_SYSTEM_PAGE, + + PREPARE_COPY_PAGE, + INSTALL_DIRECTORY_PAGE, + FILE_COPY_PAGE, + REGISTRY_PAGE, + BOOT_LOADER_PAGE, + BOOT_LOADER_FLOPPY_PAGE, + BOOT_LOADER_HARDDISK_PAGE, + + REPAIR_INTRO_PAGE, + + SUCCESS_PAGE, + QUIT_PAGE, + FLUSH_PAGE, + REBOOT_PAGE, /* virtual page */ +} PAGE_NUMBER, *PPAGE_NUMBER; + +#define POPUP_WAIT_NONE 0 +#define POPUP_WAIT_ANY_KEY 1 +#define POPUP_WAIT_ENTER 2 + + #endif /* __USETUP_H__*/ /* EOF */ Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Wed Dec 12 03:05:00 2007 @@ -43,4 +43,5 @@ <file>registry.c</file> <file>settings.c</file> <file>usetup.rc</file> + <file>mui.c</file> </module>

16 years, 9 months

[fireball] 31172: - Fix default buffer size for user-mode RtlQueryRegistryValues queries, this removes warnings on debug log about buffer being too small (it was!). - Remove ARC tree dump since this code has now been proven to work. - Sync PointerFree with WINE, removing the unhandled data type=warning.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 12 00:52:12 2007 New Revision: 31172 URL: http://svn.reactos.org/svn/reactos?rev=31172&view=rev Log: - Fix default buffer size for user-mode RtlQueryRegistryValues queries, this removes warnings on debug log about buffer being too small (it was!). - Remove ARC tree dump since this code has now been proven to work. - Sync PointerFree with WINE, removing the unhandled data type=warning. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/lib/rtl/registry.c trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c Wed Dec 12 00:52:12 2007 @@ -12,6 +12,8 @@ #include <ntdll.h> #define NDEBUG #include <debug.h> + +SIZE_T RtlpAllocDeallocQueryBufferSize = PAGE_SIZE; /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Wed Dec 12 00:52:12 2007 @@ -904,36 +904,24 @@ pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; + + if (!Pointer) return; + if (attr & RPC_FC_P_DEREF) { - Pointer = *(unsigned char**)Pointer; - TRACE("deref => %p\n", Pointer); - } - - if (!Pointer) return; - + Pointer = *(unsigned char**)Pointer; + TRACE("deref => %p\n", Pointer); + } + m = NdrFreer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc); - /* hmm... is this sensible? - * perhaps we should check if the memory comes from NdrAllocate, + /* we should check if the memory comes from NdrAllocate, * and deallocate only if so - checking if the pointer is between - * BufferStart and BufferEnd is probably no good since the buffer + * BufferStart and BufferEnd will not always work since the buffer * may be reallocated when the server wants to marshal the reply */ - switch (*desc) { - case RPC_FC_BOGUS_STRUCT: - case RPC_FC_BOGUS_ARRAY: - case RPC_FC_USER_MARSHAL: - break; - default: - FIXME("unhandled data type=%02x\n", *desc); - case RPC_FC_CARRAY: - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: - if (pStubMsg->ReuseBuffer) goto notfree; - break; - case RPC_FC_IP: - goto notfree; - } + if (Pointer >= (unsigned char *)pStubMsg->RpcMsg->Buffer || + Pointer <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + goto notfree; if (attr & RPC_FC_P_ONSTACK) { TRACE("not freeing stack ptr %p\n", Pointer); Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=311… ============================================================================== --- trunk/reactos/lib/rtl/registry.c (original) +++ trunk/reactos/lib/rtl/registry.c Wed Dec 12 00:52:12 2007 @@ -14,6 +14,8 @@ #include <debug.h> #define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') + +extern SIZE_T RtlpAllocDeallocQueryBufferSize; /* DATA **********************************************************************/ @@ -970,7 +972,7 @@ NTSTATUS Status; PKEY_VALUE_FULL_INFORMATION KeyValueInfo = NULL; HANDLE KeyHandle, CurrentKey; - SIZE_T BufferSize = 128, InfoSize; + SIZE_T BufferSize, InfoSize; UNICODE_STRING KeyPath, KeyValueName; OBJECT_ATTRIBUTES ObjectAttributes; ULONG i, Value; @@ -985,6 +987,7 @@ (RelativeTo & RTL_REGISTRY_HANDLE) ? NULL : Path); /* Allocate a query buffer */ + BufferSize = RtlpAllocDeallocQueryBufferSize; KeyValueInfo = RtlpAllocDeallocQueryBuffer(&BufferSize, NULL, 0, &Status); if (!KeyValueInfo) { Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Wed Dec 12 00:52:12 2007 @@ -207,37 +207,10 @@ ULONG Interface = InterfaceType, Bus = BusNumber, i; NTSTATUS Status; HANDLE NewHandle; - static ULONG t, tabLevel; - PCHAR InterfaceStrings[MaximumInterfaceType + 1] = - { - "Internal", - "Isa", - "Eisa", - "MicroChannel", - "TurboChannel", - "PCIBus", - "VMEBus", - "NuBus", - "PCMCIABus", - "CBus", - "MPIBus", - "MPSABus", - "ProcessorInternal", - "InternalPowerBus", - "PNPISABus", - "PNPBus", - "Unknown" - }; /* Loop each entry */ while (CurrentEntry) { - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Dumping node @ 0x%p\n", CurrentEntry); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Parent @ 0x%p Sibling @ 0x%p Child @ 0x%p\n", - CurrentEntry->Parent, CurrentEntry->Sibling, CurrentEntry->Child); - /* Check if this is an adapter */ Component = &CurrentEntry->ComponentEntry; if ((Component->Class == AdapterClass) && @@ -303,35 +276,7 @@ } /* Dump information on the component */ - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Component Type: %wZ\n", &CmTypeName[Component->Type]); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Class: %wZ\n", &CmClassName[Component->Class]); - if (Component->Class != SystemClass) - { - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Device Index: %lx\n", DeviceIndexTable[Component->Type]); - } - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Component Information:\n"); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("\tFlags: %lx\n", Component->Flags); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("\tVersion: %lx\n", Component->Version); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("\tAffinity: %lx\n", Component->AffinityMask); - if (Component->IdentifierLength) - { - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Identifier: %S\n", Component->Identifier); - } - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Configuration Data: %p\n", CurrentEntry->ConfigurationData); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Interface Type: %s Bus Number: %d\n\n", - InterfaceStrings[Interface], - Bus); - + /* Setup the hardware node */ Status = CmpInitializeRegistryNode(CurrentEntry, ParentHandle, @@ -345,12 +290,10 @@ if (CurrentEntry->Child) { /* Recurse child */ - tabLevel++; Status = CmpSetupConfigurationTree(CurrentEntry->Child, NewHandle, Interface, Bus); - tabLevel--; if (!NT_SUCCESS(Status)) { /* Fail */ @@ -433,8 +376,6 @@ if (LoaderBlock->ConfigurationRoot) { /* Setup the configuration tree */ - DPRINT1("ARC Hardware Tree Received @ 0x%p. Dumping HW Info:\n\n", - LoaderBlock->ConfigurationRoot); Status = CmpSetupConfigurationTree(LoaderBlock->ConfigurationRoot, KeyHandle, -1, @@ -455,3 +396,4 @@ + Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Wed Dec 12 00:52:12 2007 @@ -22,6 +22,7 @@ } RTL_RANGE_ENTRY, *PRTL_RANGE_ENTRY; PAGED_LOOKASIDE_LIST RtlpRangeListEntryLookasideList; +SIZE_T RtlpAllocDeallocQueryBufferSize = 128; /* FUNCTIONS *****************************************************************/

16 years, 9 months

[fireball] 31171: - Two more leftovers.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 12 00:34:04 2007 New Revision: 31171 URL: http://svn.reactos.org/svn/reactos?rev=31171&view=rev Log: - Two more leftovers. Modified: trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c Wed Dec 12 00:34:04 2007 @@ -15,7 +15,7 @@ #include <include/class2.h> #include <stdio.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #define IO_WRITE_CACHE_ENABLED ((NTSTATUS)0x80040020L) Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=31… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Wed Dec 12 00:34:04 2007 @@ -111,7 +111,6 @@ } /* Insert it into our temporary list */ - DPRINT1("Adding a timer!\n"); InsertTailList(&TempList, &Timer->TimerListEntry); } } @@ -152,7 +151,6 @@ } /* Insert it into our temporary list */ - DPRINT1("Adding a timer 2!\n"); InsertTailList(&TempList2, &Timer->TimerListEntry); }

16 years, 9 months

← Newer
1
...
33
34
35
36
37
38
39
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007