Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[jimtabor] 51831: [User32] - Add Switch Class support. See bug 5378. Original patch by David Quintana. Alt-Tab works the same as windows, Alt-Esc needs more work.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat May 21 00:12:48 2011 New Revision: 51831 URL: http://svn.reactos.org/svn/reactos?rev=51831&view=rev Log: [User32] - Add Switch Class support. See bug 5378. Original patch by David Quintana. Alt-Tab works the same as windows, Alt-Esc needs more work. Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt trunk/reactos/dll/win32/user32/controls/appswitch.c trunk/reactos/dll/win32/user32/controls/regcontrol.c trunk/reactos/dll/win32/user32/include/controls.h trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sat May 21 00:12:48 2011 @@ -13,6 +13,7 @@ set_rc_compiler() list(APPEND SOURCE + controls/appswitch.c controls/button.c controls/combo.c controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/appswitch.c [iso-8859-1] Sat May 21 00:12:48 2011 @@ -1,10 +1,10 @@ - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/user32/controls/appswitch.c * PURPOSE: app switching functionality * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + * David Quintana (gigaherz(a)gmail.com) */ #include <user32.h> @@ -12,259 +12,548 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -typedef struct APPSWITCH_ITEM -{ - HWND hwndDlg; - DWORD zPos; - HICON hIcon; - BOOL bFocus; - struct APPSWITCH_ITEM * Next; - WCHAR szText[1]; -} APPSWITCH_ITEM, *PAPPSWITCH_ITEM; - -static PAPPSWITCH_ITEM pRoot = NULL; -static DWORD NumOfWindows = 0; -static HWND hAppWindowDlg = NULL; -static HHOOK hhk = NULL; - -UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); - - -BOOL -CALLBACK -EnumWindowEnumProc( - HWND hwnd, - LPARAM lParam -) -{ - PAPPSWITCH_ITEM pItem; - UINT Length; - HICON hIcon; - PAPPSWITCH_ITEM pCurItem; - DWORD dwPid; - HANDLE hProcess; - WCHAR szFileName[MAX_PATH] = {0}; - - /* check if the enumerated window is visible */ - if (!IsWindowVisible(hwnd)) - return TRUE; - /* get window icon */ - hIcon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_BIG, 0); - if (!hIcon) +// limit the number of windows shown in the alt-tab window +// 120 windows results in (12*40) by (10*40) pixels worth of icons. +#define MAX_WINDOWS 120 + +// Global variables +HWND switchdialog; +HFONT dialogFont; +int selectedWindow = 0; +BOOL isOpen = FALSE; + +int fontHeight=0; + +WCHAR windowText[1024]; + +HWND windowList[MAX_WINDOWS]; +HICON iconList[MAX_WINDOWS]; +int windowCount = 0; + +int cxBorder, cyBorder; +int nItems, nCols, nRows; +int itemsW, itemsH; +int totalW, totalH; +int xOffset, yOffset; +POINT pt; + +void ResizeAndCenter(HWND hwnd, int width, int height) +{ + int screenwidth = GetSystemMetrics(SM_CXSCREEN); + int screenheight = GetSystemMetrics(SM_CYSCREEN); + + pt.x = (screenwidth - width) / 2; + pt.y = (screenheight - height) / 2; + + MoveWindow(hwnd, pt.x, pt.y, width, height, FALSE); +} + +void MakeWindowActive(HWND hwnd) +{ + WINDOWPLACEMENT wpl; + + GetWindowPlacement(hwnd, &wpl); + + if (wpl.showCmd == SW_SHOWMINIMIZED) + ShowWindow(hwnd, SW_RESTORE); + + BringWindowToTop(hwnd); // same as: SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ? + SetForegroundWindow(hwnd); +} + +void CompleteSwitch(BOOL doSwitch) +{ + if (!isOpen) + return; + + isOpen = FALSE; + + TRACE("[ATbot] CompleteSwitch Hiding Window.\n"); + ShowWindow(switchdialog, SW_HIDE); + + if(doSwitch) + { + if(selectedWindow >= windowCount) + return; + + // FIXME: workaround because reactos fails to activate the previous window correctly. + //if(selectedWindow != 0) + { + HWND hwnd = windowList[selectedWindow]; + + GetWindowTextW(hwnd, windowText, 1023); + + TRACE("[ATbot] CompleteSwitch Switching to 0x%08x (%ls)\n", hwnd, windowText); + + MakeWindowActive(hwnd); + } + } + + windowCount = 0; +} + +BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam) +{ + HICON hIcon; + + UNREFERENCED_PARAMETER(lParam); + + if (!IsWindowVisible(window)) + return TRUE; + + GetClassNameW(window,windowText,4095); + if ((wcscmp(L"Shell_TrayWnd",windowText)==0) || + (wcscmp(L"Progman",windowText)==0) ) + return TRUE; + + // First try to get the big icon assigned to the window + hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_BIG, 0); + if (!hIcon) + { + // If no icon is assigned, try to get the icon assigned to the windows' class + hIcon = (HICON)GetClassLongPtrW(window, GCL_HICON); + if (!hIcon) + { + // If we still don't have an icon, see if we can do with the small icon, + // or a default application icon + hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_SMALL2, 0); + if (!hIcon) + { + // If all fails, give up and continue with the next window + return TRUE; + } + } + } + + windowList[windowCount] = window; + iconList[windowCount] = CopyIcon(hIcon); + + windowCount++; + + // If we got to the max number of windows, + // we won't be able to add any more + if(windowCount == MAX_WINDOWS) + return FALSE; + + return TRUE; +} + +// Function mostly compatible with the normal EnumWindows, +// except it lists in Z-Order and it doesn't ensure consistency +// if a window is removed while enumerating +void EnumWindowsZOrder(WNDENUMPROC callback, LPARAM lParam) +{ + HWND next = GetTopWindow(NULL); + while (next != NULL) { - GetWindowThreadProcessId(hwnd, &dwPid); - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ, FALSE, dwPid); - if (hProcess) + if(!callback(next, lParam)) + break; + next = GetWindow(next, GW_HWNDNEXT); + } +} + +void ProcessMouseMessage(UINT message, LPARAM lParam) +{ + int xPos = LOWORD(lParam); + int yPos = HIWORD(lParam); + + int xIndex = (xPos - xOffset)/40; + int xOff = (xPos - xOffset)%40; + + int yIndex = (yPos - yOffset)/40; + int yOff = (yPos - yOffset)%40; + + if(xOff > 32 || xIndex > nItems) + return; + + if(yOff > 32 || yIndex > nRows) + return; + + selectedWindow = (yIndex*nCols) + xIndex; + if (message == WM_MOUSEMOVE) + { + InvalidateRect(switchdialog, NULL, TRUE); + //RedrawWindow(switchdialog, NULL, NULL, 0); + } + else + { + selectedWindow = (yIndex*nCols) + xIndex; + CompleteSwitch(TRUE); + } +} + +void OnPaint(HWND hWnd) +{ + HDC dialogDC; + PAINTSTRUCT paint; + RECT cRC, textRC; + int i; + HBRUSH hBrush; + HPEN hPen; + COLORREF cr; + int nch = GetWindowTextW(windowList[selectedWindow], windowText, 1023); + + dialogDC = BeginPaint(hWnd, &paint); + { + GetClientRect(hWnd, &cRC); + FillRect(dialogDC, &cRC, GetSysColorBrush(COLOR_MENU)); + + for(i=0; i< windowCount; i++) + { + HICON hIcon = iconList[i]; + + int xpos = xOffset + 40 * (i % nCols); + int ypos = yOffset + 40 * (i / nCols); + + if (selectedWindow == i) + { + hBrush = GetSysColorBrush(COLOR_HIGHLIGHT); + } + else + { + hBrush = GetSysColorBrush(COLOR_MENU); + } +#if TRUE + cr = GetSysColor(COLOR_BTNTEXT); // doesn't look right! >_< + hPen = CreatePen(PS_DOT, 1, cr); + SelectObject(dialogDC, hPen); + SelectObject(dialogDC, hBrush); + Rectangle(dialogDC, xpos-2, ypos-2, xpos+32+2, ypos+32+2); + DeleteObject(hPen); + // Must NOT destroy the system brush! +#else + RECT rc = { xpos-2, ypos-2, xpos+32+2, ypos+32+2 }; + FillRect(dialogDC, &rc, hBrush); +#endif + DrawIcon(dialogDC, xpos, ypos, hIcon); + } + + SelectObject(dialogDC, dialogFont); + SetTextColor(dialogDC, GetSysColor(COLOR_BTNTEXT)); + SetBkColor(dialogDC, GetSysColor(COLOR_BTNFACE)); + + textRC.top = itemsH; + textRC.left = 8; + textRC.right = totalW - 8; + textRC.bottom = totalH - 8; + DrawTextW(dialogDC, windowText, nch, &textRC, DT_CENTER|DT_END_ELLIPSIS); + } + EndPaint(hWnd, &paint); +} + +DWORD CreateSwitcherWindow(HINSTANCE hInstance) +{ + switchdialog = CreateWindowExW( WS_EX_TOPMOST|WS_EX_DLGMODALFRAME|WS_EX_TOOLWINDOW, + WC_SWITCH, + L"", + WS_POPUP|WS_BORDER|WS_DISABLED, + CW_USEDEFAULT, + CW_USEDEFAULT, + 400, 150, + NULL, NULL, + hInstance, NULL); + if (!switchdialog) + { + TRACE("[ATbot] Task Switcher Window failed to create.\n"); + return 0; + } + + isOpen = FALSE; + return 1; +} + +DWORD GetDialogFont() +{ + HDC tDC; + TEXTMETRIC tm; + + dialogFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + + tDC = GetDC(0); + GetTextMetrics(tDC, &tm); + fontHeight = tm.tmHeight; + ReleaseDC(0, tDC); + + return 1; +} + +void PrepareWindow() +{ + cxBorder = GetSystemMetrics(SM_CXBORDER); + cyBorder = GetSystemMetrics(SM_CYBORDER); + + nItems = windowCount; + nCols = min(max(nItems,8),12); + nRows = (nItems+nCols-1)/nCols; + + itemsW = nCols*32 + (nCols+1)*8; + itemsH = nRows*32 + (nRows+1)*8; + + totalW = itemsW + 2*cxBorder + 4; + totalH = itemsH + 2*cyBorder + fontHeight + 8; // give extra pixels for the window title + + xOffset = 8; + yOffset = 8; + + if (nItems < nCols) + { + int w2 = nItems*32 + (nItems-1)*8; + xOffset = (itemsW-w2)/2; + } + ResizeAndCenter(switchdialog, totalW, totalH); +} + +void ProcessHotKey() +{ + if (!isOpen) + { + windowCount=0; + EnumWindowsZOrder(EnumerateCallback, 0); + + if (windowCount < 2) + return; + + selectedWindow = 1; + + TRACE("[ATbot] HotKey Received. Opening window.\n"); + ShowWindow(switchdialog, SW_SHOWNORMAL); + MakeWindowActive(switchdialog); + isOpen = TRUE; + } + else + { + TRACE("[ATbot] HotKey Received Rotating.\n"); + selectedWindow = (selectedWindow + 1)%windowCount; + InvalidateRect(switchdialog, NULL, TRUE); + } +} + +LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam ) +{ + HWND hwnd; + MSG msg; + BOOL Esc = FALSE; + INT Count = 0; + WCHAR Text[1024]; + + switchdialog = NULL; + + switch (lParam) + { + case VK_TAB: + if( !CreateSwitcherWindow(User32Instance) ) return 0; + if( !GetDialogFont() ) return 0; + ProcessHotKey(); + break; + + case VK_ESCAPE: + windowCount = 0; + Count = 0; + EnumWindowsZOrder(EnumerateCallback, 0); + if (windowCount < 2) return 0; + if (wParam == SC_NEXTWINDOW) + Count = 1; + else + { + if (windowCount == 2) + Count = 0; + else + Count = windowCount - 1; + } + TRACE("DoAppSwitch VK_ESCAPE 1 Count %d windowCount %d\n",Count,windowCount); + hwnd = windowList[Count]; + GetWindowTextW(hwnd, Text, 1023); + TRACE("[ATbot] Switching to 0x%08x (%ls)\n", hwnd, Text); + MakeWindowActive(hwnd); + Esc = TRUE; + break; + + default: + return 0; + } + // Main message loop: + while (1) + { + for (;;) + { + if (PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE )) + { + if (!CallMsgFilterW( &msg, MSGF_NEXTWINDOW )) break; + /* remove the message from the queue */ + PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); + } + else + WaitMessage(); + } + + switch (msg.message) + { + case WM_KEYUP: { -// if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) - { - szFileName[MAX_PATH-1] = L'\0'; - PrivateExtractIconExW(szFileName, 0, &hIcon, NULL, 1); - } + PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); + if (msg.wParam == VK_MENU) + { + CompleteSwitch(TRUE); + } + else if (msg.wParam == VK_RETURN) + { + CompleteSwitch(TRUE); + } + else if (msg.wParam == VK_ESCAPE) + { + TRACE("DoAppSwitch VK_ESCAPE 2\n"); + CompleteSwitch(FALSE); + } + goto Exit; //break; } - } - else - { - /* icons from WM_GETICON need to be copied */ - hIcon = CopyIcon(hIcon); - } - /* get the text length */ - Length = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); - /* allocate item structure for it */ -// pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); - if (!pItem) - return TRUE; - if (Length) - { - /* retrieve the window text when available */ - SendMessageW(hwnd, WM_GETTEXT, Length+1, (LPARAM)pItem->szText); - } - /* copy the window icon */ - pItem->hIcon = hIcon; - /* store window handle */ - pItem->hwndDlg = hwnd; - /* is the window the active window */ - if (GetActiveWindow() == hwnd) - pItem->bFocus = TRUE; - - if (!pRoot) - { - /* first item */ - pRoot = pItem; - return TRUE; - } - - /* enumerate the last item */ - pCurItem = pRoot; - while(pCurItem->Next) - pCurItem = pCurItem->Next; - - /* insert it into the list */ - pCurItem->Next = pItem; - NumOfWindows++; - return TRUE; -} - -VOID -EnumerateAppWindows(HDESK hDesk, HWND hwndDlg) -{ - /* initialize defaults */ - pRoot = NULL; - NumOfWindows = 0; - hAppWindowDlg = hwndDlg; - /* enumerate all windows */ - EnumDesktopWindows(hDesk, EnumWindowEnumProc, (LPARAM)NULL); - if (NumOfWindows > 7) - { - /* FIXME resize window */ - } -} - -VOID -MarkNextEntryAsActive() -{ - PAPPSWITCH_ITEM pItem; - - pItem = pRoot; - if (!pRoot) - return; - - while(pItem) - { - if (pItem->bFocus) + + case WM_SYSKEYDOWN: { - pItem->bFocus = FALSE; - if (pItem->Next) - pItem->Next->bFocus = TRUE; - else - pRoot->bFocus = TRUE; + PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); + if (HIWORD(msg.lParam) & KF_ALTDOWN) + { + INT Shift; + if ( msg.wParam == VK_TAB ) + { + if (Esc) break; + Shift = GetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW; + if (Shift == SC_NEXTWINDOW) + { + selectedWindow = (selectedWindow + 1)%windowCount; + } + else + { + selectedWindow = selectedWindow - 1; + if (selectedWindow < 0) + selectedWindow = windowCount - 1; + } + InvalidateRect(switchdialog, NULL, TRUE); + } + else if ( msg.wParam == VK_ESCAPE ) + { + if (!Esc) break; + if (windowCount < 2) + goto Exit; + if (wParam == SC_NEXTWINDOW) + { + Count = (Count + 1)%windowCount; + } + else + { + Count--; + if (Count < 0) + Count = windowCount - 1; + } + hwnd = windowList[Count]; + GetWindowTextW(hwnd, Text, 1023); + MakeWindowActive(hwnd); + } + } + break; } - pItem = pItem->Next; - } - - InvalidateRgn(hAppWindowDlg, NULL, TRUE); -} - - -LRESULT -CALLBACK -KeyboardHookProc( - int nCode, - WPARAM wParam, - LPARAM lParam -) -{ - PKBDLLHOOKSTRUCT hk = (PKBDLLHOOKSTRUCT) lParam; - - if (wParam == WM_SYSKEYUP) - { - /* is tab key pressed */ - if (hk->vkCode == VK_TAB) - { - if (hAppWindowDlg == NULL) - { - /* FIXME - * launch window - */ - FIXME("launch alt-tab window\n"); - } - else - { - MarkNextEntryAsActive(); - } - } - } - return CallNextHookEx(hhk, nCode, wParam, lParam); -} - -VOID -PaintAppWindows(HWND hwndDlg, HDC hDc) -{ - DWORD dwIndex, X, Y; - PAPPSWITCH_ITEM pCurItem; - RECT Rect; - DWORD XSize, YSize, XMax; - HBRUSH hBrush; - - X = 10; - Y = 10; - XSize = GetSystemMetrics(SM_CXICON); - YSize = GetSystemMetrics(SM_CYICON); - XMax = (XSize+(XSize/2)) * 7 + X; - pCurItem = pRoot; - - for (dwIndex = 0; dwIndex < NumOfWindows; dwIndex++) - { - if (X >= XMax) - { - X = 10; - Y += YSize + (YSize/2); - } - if (pCurItem->bFocus) - { - hBrush = CreateSolidBrush(RGB(30, 30, 255)); - SetRect(&Rect, X-5, Y-5, X + XSize + 5, Y + YSize + 5); - FillRect(hDc, &Rect, hBrush); - DeleteObject((HGDIOBJ)hBrush); -// SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); - } - - DrawIcon(hDc, X, Y, pCurItem->hIcon); - pCurItem = pCurItem->Next; - X += XSize +(XSize/2); - } -} + + case WM_LBUTTONUP: + PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); + ProcessMouseMessage(msg.message, msg.lParam); + goto Exit; + + default: + if (PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE )) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + break; + } + } +Exit: + if (switchdialog) DestroyWindow(switchdialog); + switchdialog = NULL; + selectedWindow = 0; + windowCount = 0; + return 0; +} + VOID DestroyAppWindows() { - PAPPSWITCH_ITEM pCurItem, pNextItem; - - pCurItem = pRoot; - while(pCurItem) - { - pNextItem = pCurItem->Next; - DestroyIcon(pCurItem->hIcon); -// HeapFree(Win32CsrApiHeap, 0, pCurItem); - pCurItem = pNextItem; - } - pRoot = NULL; - hAppWindowDlg = NULL; - NumOfWindows = 0; -} - -INT_PTR -CALLBACK -SwitchWindowDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - PAINTSTRUCT Paint; - HDESK hInput; - - switch (message) - { - case WM_INITDIALOG: - hInput = OpenInputDesktop(0,0, GENERIC_ALL); - if (hInput) - { - EnumerateAppWindows(hInput, hwndDlg); - CloseDesktop(hInput); - } - return TRUE; - case WM_PAINT: - BeginPaint(hwndDlg, &Paint); - PaintAppWindows(hwndDlg, Paint.hdc); - EndPaint(hwndDlg, &Paint); - break; - case WM_DESTROY: - DestroyAppWindows(); - break; - } - return FALSE; -} - -VOID -WINAPI -InitializeAppSwitchHook() -{ - hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); - TRACE("InitializeAppSwitchHook hhk %p\n", hhk); -} + INT i; + for (i=0; i< windowCount; i++) + { + HICON hIcon = iconList[i]; + DestroyIcon(hIcon); + } +} + +// +// Switch System Class Window Proc. +// +LRESULT WINAPI SwitchWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + PWND pWnd; + PALTTABINFO ati; + pWnd = ValidateHwnd(hWnd); + if (pWnd) + { + if (!pWnd->fnid) + { + NtUserSetWindowFNID(hWnd, FNID_SWITCH); + } + } + + switch (uMsg) + { + case WM_NCCREATE: + if (!(ati = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ati)))) + return 0; + SetWindowLongPtrW( hWnd, 0, (LONG_PTR)ati ); + return TRUE; + + case WM_SHOWWINDOW: + if (wParam == TRUE) + { + PrepareWindow(); + ati = (PALTTABINFO)GetWindowLongPtrW(hWnd, 0); + ati->cItems = nItems; + ati->cxItem = ati->cyItem = 43; + ati->cRows = nRows; + ati->cColumns = nCols; + } + return 0; + + case WM_MOUSEMOVE: + ProcessMouseMessage(uMsg, lParam); + return 0; + + case WM_ACTIVATE: + if (wParam == WA_INACTIVE) + { + CompleteSwitch(FALSE); + } + return 0; + + case WM_PAINT: + OnPaint(hWnd); + return 0; + + case WM_DESTROY: + isOpen = FALSE; + ati = (PALTTABINFO)GetWindowLongPtrW(hWnd, 0); + HeapFree( GetProcessHeap(), 0, ati ); + SetWindowLongPtrW( hWnd, 0, 0 ); + DestroyAppWindows(); + NtUserSetWindowFNID(hWnd, FNID_DESTROY); + return 0; + } + return DefWindowProcW(hWnd, uMsg, wParam, lParam); +} + +LRESULT WINAPI SwitchWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return SwitchWndProc_common(hWnd, uMsg, wParam, lParam, FALSE); +} + +LRESULT WINAPI SwitchWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return SwitchWndProc_common(hWnd, uMsg, wParam, lParam, TRUE); +} Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] Sat May 21 00:12:48 2011 @@ -131,8 +131,8 @@ pfnClientW.pfnDefWindowProc = DefWindowProcW; pfnClientA.pfnMessageWindowProc = MsgWindowProc; pfnClientW.pfnMessageWindowProc = MsgWindowProc; - pfnClientA.pfnSwitchWindowProc = DefWindowProcA; - pfnClientW.pfnSwitchWindowProc = DefWindowProcW; + pfnClientA.pfnSwitchWindowProc = SwitchWndProcA; + pfnClientW.pfnSwitchWindowProc = SwitchWndProcW; pfnClientA.pfnButtonWndProc = ButtonWndProcA; pfnClientW.pfnButtonWndProc = ButtonWndProcW; pfnClientA.pfnComboBoxWndProc = ComboWndProcA; Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Sat May 21 00:12:48 2011 @@ -114,3 +114,5 @@ LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode); +LRESULT WINAPI SwitchWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI SwitchWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 21 00:12:48 2011 @@ -26,10 +26,6 @@ void MENU_EndMenu( HWND ); /* GLOBALS *******************************************************************/ - -/* Bits in the dwKeyData */ -#define KEYDATA_ALT 0x2000 -#define KEYDATA_PREVSTATE 0x4000 static short iF10Key = 0; static short iMenuSysKey = 0; @@ -828,10 +824,10 @@ case SC_SCREENSAVE: NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); break; - +LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam); case SC_NEXTWINDOW: case SC_PREVWINDOW: - FIXME("Implement Alt-Tab!!! wParam 0x%x lParam 0x%x\n",wParam,lParam); + DoAppSwitch( wParam, lParam); break; case SC_HOTKEY: @@ -1423,10 +1419,10 @@ case WM_SYSKEYDOWN: { - if (HIWORD(lParam) & KEYDATA_ALT) + if (HIWORD(lParam) & KF_ALTDOWN) { /* Previous state, if the key was down before this message, this is a cheap way to ignore autorepeat keys. */ - if ( !(HIWORD(lParam) & KEYDATA_PREVSTATE) ) + if ( !(HIWORD(lParam) & KF_REPEAT) ) { if ( ( wParam == VK_MENU || wParam == VK_LMENU || @@ -1494,7 +1490,7 @@ PostMessageW( hWnd, WM_SYSCOMMAND, SC_RESTORE, 0L ); break; } - if ((HIWORD(lParam) & KEYDATA_ALT) && wParam) + if ((HIWORD(lParam) & KF_ALTDOWN) && wParam) { if (wParam == VK_TAB || wParam == VK_ESCAPE) break; if (wParam == VK_SPACE && (GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_CHILD))

13 years, 5 months

[spetreolle] 51830: Rehaul the bootcd tree. All dlls and drivers are in their normal directories instead of having all in reactos\. Original implementation by zefklop in cmake branch.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri May 20 22:29:54 2011 New Revision: 51830 URL: http://svn.reactos.org/svn/reactos?rev=51830&view=rev Log: Rehaul the bootcd tree. All dlls and drivers are in their normal directories instead of having all in reactos\. Original implementation by zefklop in cmake branch. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rbuild trunk/reactos/drivers/base/kddll/kddll.rbuild trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild trunk/reactos/drivers/bus/acpi/acpi.rbuild trunk/reactos/drivers/bus/isapnp/isapnp.rbuild trunk/reactos/drivers/bus/pci/pci.rbuild trunk/reactos/drivers/bus/pcix/pcix.rbuild trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild trunk/reactos/drivers/filesystems/ext2/ext2.rbuild trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild trunk/reactos/drivers/setup/blue/blue.rbuild trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/class/disk/disk.rbuild trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild trunk/reactos/drivers/storage/classpnp/classpnp.rbuild trunk/reactos/drivers/storage/floppy/floppy.rbuild trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/hal/halarm/hal.rbuild trunk/reactos/hal/halarm/omap3/halup.rbuild trunk/reactos/hal/halarm/versa/halup.rbuild trunk/reactos/hal/halppc/up/halup.rbuild trunk/reactos/hal/halx86/hal.rbuild trunk/reactos/hal/halx86/halacpi.rbuild trunk/reactos/hal/halx86/halamd64.rbuild trunk/reactos/hal/halx86/halmps.rbuild trunk/reactos/media/nls/nls.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1404,7 +1404,7 @@ ULONGLONG m1, m2; /* check for unpartitioned space */ - m1 = PartEntry->UnpartitionedLength; + m1 = PartEntry->UnpartitionedLength; m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */ if( m1 > RequiredPartitionDiskSpace) @@ -2843,6 +2843,7 @@ PWCHAR FileKeyValue; PWCHAR DirKeyValue; PWCHAR TargetFileName; + WCHAR CompleteOrigFileName[512]; if (SourceCabinet) return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); @@ -2901,10 +2902,14 @@ break; } + wcscpy(CompleteOrigFileName, SourceRootDir.Buffer); + wcscat(CompleteOrigFileName, L"\\"); + wcscat(CompleteOrigFileName, DirKeyValue); + if (!SetupQueueCopy(SetupFileQueue, SourceCabinet, SourceRootPath.Buffer, - SourceRootDir.Buffer, + CompleteOrigFileName, FileKeyName, DirKeyValue, TargetFileName)) @@ -3601,10 +3606,10 @@ { UCHAR PartitionType; NTSTATUS Status; - + PartitionType = PartitionList->ActiveBootPartition-> PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; - + Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, &DestinationArcPath, @@ -3614,7 +3619,7 @@ MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } - + return SUCCESS_PAGE; } @@ -3644,10 +3649,10 @@ swprintf(DestinationDevicePathBuffer, L"\\Device\\Harddisk%d\\Partition0", PartitionList->ActiveBootDisk->DiskNumber); - + wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); - + DPRINT("Install MBR bootcode: %S ==> %S\n", SourceMbrPathBuffer, DestinationDevicePathBuffer); @@ -3931,7 +3936,7 @@ case BOOT_LOADER_HARDDISK_MBR_PAGE: Page = BootLoaderHarddiskMbrPage(&Ir); break; - + case BOOT_LOADER_HARDDISK_VBR_PAGE: Page = BootLoaderHarddiskVbrPage(&Ir); break; Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri May 20 22:29:54 2011 @@ -39,7 +39,12 @@ scsiport.sys=,,,,,,x,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 -ext2.sys=,,,,,,x,,,,,,4 +ext2fs.sys=,,,,,,x,,,,,,4 +classpnp.sys=,,,,,,,,,,,,4 +pcix.sys=,,,,,,,,,,,,4 +pcmcia.sys=,,,,,,,,,,,,4 +swenum.sys=,,,,,,,,,,,,4 +ntdll.dll=,,,,,,,,,,,,2 [HardwareIdsDatabase] ;*PNP0A00 = isapnp Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Fri May 20 22:29:54 2011 @@ -109,11 +109,11 @@ VOID SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) { - INFCONTEXT InfContext; + INFCONTEXT InfContext, dirContext; BOOLEAN Status; - LPCSTR Media, DriverName; + LPCSTR Media, DriverName, dirIndex, ImagePath; WCHAR ServiceName[256]; - WCHAR ImagePath[256]; + WCHAR ImagePathW[256]; /* Open inf section */ if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext)) @@ -123,23 +123,28 @@ do { if (InfGetDataField(&InfContext, 7, &Media) && - InfGetDataField(&InfContext, 0, &DriverName)) + InfGetDataField(&InfContext, 0, &DriverName) && + InfGetDataField(&InfContext, 13, &dirIndex)) { - if (strcmp(Media, "x") == 0) + if ((strcmp(Media, "x") == 0) && + InfFindFirstLine(InfHandle, "Directories", dirIndex, &dirContext) && + InfGetDataField(&dirContext, 1, &ImagePath)) { /* Convert name to widechar */ swprintf(ServiceName, L"%S", DriverName); + /* Prepare image path */ + swprintf(ImagePathW, L"%S", ImagePath); + wcscat(ImagePathW, L"\\"); + wcscat(ImagePathW, ServiceName); + /* Remove .sys extension */ ServiceName[wcslen(ServiceName) - 4] = 0; - - /* Prepare image path */ - swprintf(ImagePath, L"%S", DriverName); /* Add it to the list */ Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - ImagePath, + ImagePathW, ServiceName); if (!Status) @@ -274,31 +279,34 @@ UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); + strcpy(FileName, "\\ArcName\\"); + /* Load kernel */ - strcpy(FileName, BootPath); - strcat(FileName, "NTOSKRNL.EXE"); - Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase); + strcpy(FileName+strlen("\\ArcName\\"), BootPath); + strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); + Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderSystemCode, &NtosBase); DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase); + Status = WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", + FileName, NtosBase, &KernelDTE); + DPRINTM(DPRINT_WINDOWS, "Ntos Data Table Entry allocated with status %d at %p\n", Status, KernelDTE); /* Load HAL */ - strcpy(FileName, BootPath); - strcat(FileName, "HAL.DLL"); - Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase); + strcpy(FileName+strlen("\\ArcName\\"), BootPath); + strcat(FileName, "SYSTEM32\\HAL.DLL"); + Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderHalCode, &HalBase); DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase); + Status = WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", + FileName, HalBase, &HalDTE); + DPRINTM(DPRINT_WINDOWS, "HAL Data Table Entry allocated with status %d at %p\n", Status, HalDTE); /* Load kernel-debugger support dll */ - strcpy(FileName, BootPath); - strcat(FileName, "KDCOM.DLL"); - Status = WinLdrLoadImage(FileName, LoaderBootDriver, &KdComBase); + strcpy(FileName+strlen("\\ArcName\\"), BootPath); + strcat(FileName, "SYSTEM32\\KDCOM.DLL"); + Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderBootDriver, &KdComBase); DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase); - - /* Allocate data table entries for above-loaded modules */ - WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", - "NTOSKRNL.EXE", NtosBase, &KernelDTE); - WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", - "HAL.DLL", HalBase, &HalDTE); - WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", - "KDCOM.DLL", KdComBase, &KdComDTE); + Status = WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", + FileName, KdComBase, &KdComDTE); + DPRINTM(DPRINT_WINDOWS, "KdCom Data Table Entry allocated with status %d at %p\n", Status, HalDTE); /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ strcpy(SearchPath, BootPath); @@ -306,9 +314,15 @@ WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); if (KdComDTE) WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); - - /* Load NLS data */ - SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath); + /* In system32 too */ + strcpy(SearchPath + strlen(BootPath), "system32\\"); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); + if (KdComDTE) + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); + + /* Load NLS data, they are in system32 */ + SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath); /* Get a list of boot drivers */ SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath); Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1921,7 +1921,7 @@ HKEY hKey = 0; DWORD InProgress = 0; DWORD InstallDate; - + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", 0, @@ -1931,7 +1931,7 @@ RegSetValueExW( hKey, L"SystemSetupInProgress", 0, REG_DWORD, (LPBYTE)&InProgress, sizeof(InProgress) ); RegCloseKey( hKey ); } - + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, @@ -2233,7 +2233,7 @@ { WCHAR szBuffer[MAX_PATH]; wcscpy(szBuffer, szDrive); - wcscat(szBuffer, L"reactos\\ntoskrnl.exe"); + wcscat(szBuffer, L"reactos\\system32\\ntoskrnl.exe"); LogItem(SYSSETUP_SEVERITY_INFORMATION, szBuffer); if (FileExists(szBuffer, NULL)) { @@ -2383,7 +2383,7 @@ hWnd = (HWND)PropertySheet(&psh); ShowWindow(hWnd, SW_SHOW); - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessage(&msg, NULL, 0, 0)) { if(!IsDialogMessage(hWnd, &msg)) { Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="bootvid" type="kernelmodedll" entrypoint="0" installbase="system32" installname="bootvid.dll"> <importlibrary definition="bootvid.spec"></importlibrary> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="bootvid.dll" /> <include base="bootvid">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kdcom" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kdcom.dll"> <importlibrary definition="kdcom.spec"></importlibrary> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="kdcom.dll" /> <include base="kdcom">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/base/kddll/kddll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.r… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -16,7 +16,7 @@ <module name="kdcom" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kdcom.dll"> <importlibrary definition="kddll.spec"></importlibrary> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="kdcom.dll" /> <include base="kdcom">.</include> <library>kdlib</library> <library>kdserial</library> Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="nmidebug" type="kernelmodedriver" installbase="system32/drivers" installname="nmidebug.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="null">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -18,7 +18,7 @@ </if> <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="acpi">include</include> <include base="acpica">include</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/bus/isapnp/isapnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="isapnp" type="kernelmodedriver" installbase="system32/drivers" installname="isapnp.sys"> - <bootstrap installbase="$(CDOUTPUT)"/> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers"/> <include base="isapnp">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/bus/pci/pci.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.rbuild… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="pci">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/bus/pcix/pcix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcix.rbui… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="pcix" type="kernelmodedriver" installbase="system32/drivers" installname="pcix.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="pcix">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="pcmcia" type="kernelmodedriver" installbase="system32/drivers" installname="pcmcia.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="pcmcia">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="cdfs">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> +<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2fs.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="ext2fs">inc</include> <compilerflag compilerset="msc">/wd4003</compilerflag> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="fastfat">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="fastfatn" type="kernelmodedriver" installbase="system32/drivers" installname="fastfatn.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="fastfatn">.</include> <include base="ReactOS">include/reactos/libs/fullfat</include> <library>fullfat</library> Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="ntfs">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>ntoskrnl</library> <library>hal</library> <file>createclose.c</file> Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="swenum" type="kernelmodedriver" installbase="system32/drivers" installname="swenum.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>ntoskrnl</library> <library>ks</library> <file>swenum.c</file> Modified: trunk/reactos/drivers/setup/blue/blue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.rb… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="cdrom_new" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom_new.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>ntoskrnl</library> <library>hal</library> <library>classpnp</library> Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <importlibrary definition="class2.spec" /> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="ramdisk" type="kernelmodedriver" installbase="system32/drivers" installname="ramdisk.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <library>ntoskrnl</library> <library>hal</library> <file>ramdisk.c</file> Modified: trunk/reactos/drivers/storage/classpnp/classpnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="classpnp" type="kernelmodedriver" installbase="system32/drivers" installname="classpnp.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <importlibrary definition="class.spec" /> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="floppy">.</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="atapi">.</include> <library>scsiport</library> <library>libcntpr</library> Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="uniata" type="kernelmodedriver" installbase="system32/drivers" installname="uniata.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="uniata">.</include> <include base="uniata">inc</include> <group compilerset="gcc"> Modified: trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys" crt="libcntpr"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <include base="buslogic">.</include> <library>scsiport</library> <file>BusLogic958.c</file> Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <define name="_SCSIPORT_" /> <importlibrary definition="scsiport.pspec" /> <include base="scsiport">.</include> Modified: trunk/reactos/hal/halarm/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/hal.rbuild?rev=… ============================================================================== --- trunk/reactos/hal/halarm/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/hal.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -3,7 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll"> <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> Modified: trunk/reactos/hal/halarm/omap3/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/omap3/halup.rbu… ============================================================================== --- trunk/reactos/hal/halarm/omap3/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/omap3/halup.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" /> <include base="hal">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> Modified: trunk/reactos/hal/halarm/versa/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/versa/halup.rbu… ============================================================================== --- trunk/reactos/hal/halarm/versa/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/versa/halup.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" /> <include base="hal">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> Modified: trunk/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem"> <importlibrary definition="../../hal/hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" /> <include base="halppc_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> Modified: trunk/reactos/hal/halx86/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=… ============================================================================== --- trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -3,7 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll"> <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> Modified: trunk/reactos/hal/halx86/halacpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halacpi.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -3,7 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="halacpi" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="halacpi.dll"> <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -3,7 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" /> <include base="hal">include</include> <include base="ntoskrnl">include</include>  Modified: trunk/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r… ============================================================================== --- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -3,7 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8"> <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="CONFIG_SMP" /> Modified: trunk/reactos/media/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/nls.rbuild?rev=5… ============================================================================== --- trunk/reactos/media/nls/nls.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/nls/nls.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile> - <cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile> - <cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)/system32">c_437.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)/system32">c_1252.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)/system32">l_intl.nls</cdfile> <installfile installbase="system32">c_037.nls</installfile> <installfile installbase="system32">c_424.nls</installfile> Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Fri May 20 22:29:54 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="ntoskrnl.pspec" /> <define name="__NTOSKRNL__" /> <define name="_NTOSKRNL_" />

13 years, 5 months

[spetreolle] 51829: Fix dependency graph in yEd. - ntdll target was not found when added in first. - ntoskrnl has to be in the graph despite being an EXECUTABLE.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri May 20 21:31:47 2011 New Revision: 51829 URL: http://svn.reactos.org/svn/reactos?rev=51829&view=rev Log: Fix dependency graph in yEd. - ntdll target was not found when added in first. - ntoskrnl has to be in the graph despite being an EXECUTABLE. Modified: trunk/reactos/CMakeMacros.cmake Modified: trunk/reactos/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=5182… ============================================================================== --- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Fri May 20 21:31:47 2011 @@ -42,7 +42,7 @@ macro(add_dependency_node _node) if(GENERATE_DEPENDENCY_GRAPH) get_target_property(_type ${_node} TYPE) - if(_type MATCHES SHARED_LIBRARY) + if(_type MATCHES SHARED_LIBRARY OR ${_node} MATCHES ntoskrnl) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " <node id=\"${_node}\"/>\n") endif() endif() @@ -59,10 +59,10 @@ macro(add_dependency_header) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<graphml>\n <graph id=\"ReactOS dependencies\" edgedefault=\"directed\">\n") +endmacro() + +macro(add_dependency_footer) add_dependency_node(ntdll) -endmacro() - -macro(add_dependency_footer) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " </graph>\n</graphml>\n") endmacro()

13 years, 5 months

[tkreuzer] 51828: [GDI FONT DRIVER] - Due to the ret^Z^Z^Z unfavourable behaviour of FT_Get_Advances to return either font units or fractional pixels without a way to distinguish, use FT_Get_Advanc...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri May 20 19:04:57 2011 New Revision: 51828 URL: http://svn.reactos.org/svn/reactos?rev=51828&view=rev Log: [GDI FONT DRIVER] - Due to the ret^Z^Z^Z unfavourable behaviour of FT_Get_Advances to return either font units or fractional pixels without a way to distinguish, use FT_Get_Advances only for the fast case (in this case we always get font units) und implement the slow version seperately. - fast version is if 0ed, since conversion is missing yet - If used in Windows, the driver now provides proper metrics - set lNonLinearExtLeading and lNonLinearIntLeading to 0x80000000, this seems to be some default value, needs more investigation Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Fri May 20 19:04:57 2011 @@ -150,7 +150,7 @@ * space to device space. Since we use FT_Set_Char_Size, which allows * higher precision than FT_Set_Pixel_Sizes, we need to convert into * points. So we multiply our scaling coefficients with 72 divided by - * the device resolution. We also need a 26.4 fixpoint value, so we + * the device resolution. We also need a 26.6 fixpoint value, so we * multiply with 64. */ FLOATOBJ_MulLong(&efScaleX, 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72); FLOATOBJ_DivLong(&efScaleX, pfo->sizLogResPpi.cx); @@ -176,7 +176,7 @@ /* Check if there is rotation / skewing (cannot use iComplexity!?) */ if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21)) { - __debugbreak(); + //__debugbreak(); /* Create a transformation matrix that is applied after the character * scaling. We simply use the normalized base vectors and convert them @@ -330,8 +330,8 @@ /* Copy the quantized matrix from the font structure */ pfddm->fdxQuantized = pfont->fdxQuantized; - pfddm->lNonLinearExtLeading = 0x00000000; - pfddm->lNonLinearIntLeading = 0x00000080; // FIXME + pfddm->lNonLinearExtLeading = 0x80000000; + pfddm->lNonLinearIntLeading = 0x80000000; // FIXME pfddm->lNonLinearMaxCharWidth = 0x80000000; pfddm->lNonLinearAvgCharWidth = 0x80000000; @@ -341,7 +341,8 @@ } TRACE("pfddm->fxMaxAscender=%ld, yScale=%ld, height=%ld\n", - pfddm->fxMaxAscender, pfont->sizlScale.cy, (pfont->sizlScale.cy+32)/64); + pfddm->fxMaxAscender, pfont->sizlScale.cy, + (pfont->sizlScale.cy+32)/64); //__debugbreak(); /* Return the size of the structure */ @@ -686,28 +687,53 @@ //TRACE("FtfdQueryAdvanceWidths\n"); - // FIXME: layout horizontal/vertical - fl = (iMode == QAW_GETEASYWIDTHS) ? FT_ADVANCE_FLAG_FAST_ONLY : 0; -// | (ftface->face_flags & FT_FACE_FLAG_VERTICAL) ? FT_LOAD_VERTICAL_LAYOUT : 0; -fl = 0; - - /* Loop all requested glyphs */ - for (i = 0; i < cGlyphs; i++) - { - /* Query advance width */ - fterror = FT_Get_Advance(ftface, (FT_UInt)phg[i], fl, &advance); - if (fterror || advance > 0x0FFFF000) + /* The selected glyph will be changed */ + pfont->hgSelected = -1; + + /* Check if fast version is requested */ + if (0 && iMode == QAW_GETEASYWIDTHS) + { + fl = FT_ADVANCE_FLAG_FAST_ONLY; + + /* Check if the font layout is vertical */ + if (ftface->face_flags & FT_FACE_FLAG_VERTICAL) { - WARN("Failed to query advance width hg=%lx, fl=0x%lx\n", - phg[i], fl); - pusWidths[i] = 0xffff; - bResult = FALSE; + fl |= FT_LOAD_VERTICAL_LAYOUT; } - else + + /* Loop all requested glyphs */ + for (i = 0; i < cGlyphs; i++) { - /* Transform from 16.16 points to 28.4 pixels */ - pusWidths[i] = (USHORT)((advance * 72 / pfo->sizLogResPpi.cx) >> 12); - //TRACE("Got advance width: hg=%lx, adv=%lx->%ld\n", phg[i], advance, pt.x); + /* Query advance width */ + fterror = FT_Get_Advances(ftface, (FT_UInt)phg[i], 1, fl, &advance); + if (fterror || advance > 0xFFFF) + { + pusWidths[i] = 0xffff; + bResult = FALSE; + } + else + { + pusWidths[i] = (USHORT)(advance >> 2); + //TRACE("Got advance width: hg=%lx, adv=%lx->%ld\n", phg[i], advance, pt.x); + } + } + } + else + { + /* Loop all requested glyphs */ + for (i = 0; i < cGlyphs; i++) + { + /* Load the glyph */ + fterror = FT_Load_Glyph(ftface, (FT_UInt)phg[i], 0); + if (fterror) + { + pusWidths[i] = 0xffff; + bResult = FALSE; // FIXME: return FALSE or DDI_ERROR? + } + else + { + pusWidths[i] = (USHORT)ftface->glyph->advance.x >> 2; + } } } Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Fri May 20 19:04:57 2011 @@ -273,11 +273,13 @@ FD_KERNINGPAIR *pkp2) { ULONG ul1, ul2; + + /* Calculate the values for the 2 kerning pairs */ ul1 = pkp1->wcFirst + 65536 * pkp1->wcSecond; ul2 = pkp2->wcFirst + 65536 * pkp2->wcSecond; - if (ul1 < ul2) return -1; - if (ul1 > ul2) return 1; - return 0; + + /* Return the comparison result */ + return (ul1 < ul2) ? -1 : ((ul1 > ul2) ? 1 : 0); } @@ -314,7 +316,6 @@ nTables = GETW(&pKernTable->nTables); ulLastAddress = (ULONG_PTR)pKernTable + cjSize; - /* Loop all subtables */ pSubTable = &pKernTable->subtable; for (i = 0; i < nTables; i++) @@ -322,7 +323,7 @@ /* Check if the subtable is accessible */ if ((ULONG_PTR)pSubTable + sizeof(TT_KERNING_SUBTABLE) > ulLastAddress) { - __debugbreak(); + WARN("kern table outside the file\n"); return; } @@ -330,7 +331,7 @@ cjSize = GETW(&pSubTable->usLength); if ((ULONG_PTR)pSubTable + cjSize > ulLastAddress) { - __debugbreak(); + WARN("kern table exceeds size of the file\n"); return; } @@ -341,7 +342,7 @@ cPairs += GETW(&pSubTable->format0.nPairs); if ((ULONG_PTR)&pSubTable->format0.akernpair[cPairs] > ulLastAddress) { - __debugbreak(); + WARN("Number of kerning pairs too large for table size\n"); return; } }

13 years, 5 months

[janderwald] 51827: [USBEHCI] - Enable sync frame list

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri May 20 15:06:39 2011 New Revision: 51827 URL: http://svn.reactos.org/svn/reactos?rev=51827&view=rev Log: [USBEHCI] - Enable sync frame list Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Fri May 20 15:06:39 2011 @@ -116,6 +116,7 @@ BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress EHCI_PORT_STATUS m_PortStatus[16]; // port status WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback + ULONG m_SyncFramePhysAddr; // periodic frame list physical address // set command VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); @@ -564,10 +565,15 @@ EHCI_WRITE_REGISTER_ULONG(EHCI_ASYNCLISTBASE, AsyncQueueHead->PhysicalAddr); // + // Assign the SyncList Register + // + EHCI_WRITE_REGISTER_ULONG(EHCI_PERIODICLISTBASE, m_SyncFramePhysAddr); + + // // Set Schedules to Enable and Interrupt Threshold to 1ms. // GetCommandRegister(&UsbCmd); - UsbCmd.PeriodicEnable = FALSE; + UsbCmd.PeriodicEnable = TRUE; UsbCmd.AsyncEnable = TRUE; //FIXME: Need USB Memory Manager UsbCmd.IntThreshold = 1; @@ -894,7 +900,10 @@ CUSBHardwareDevice::SetPeriodicListRegister( ULONG PhysicalAddress) { - EHCI_WRITE_REGISTER_ULONG(EHCI_PERIODICLISTBASE, PhysicalAddress); + // + // store physical address + // + m_SyncFramePhysAddr = PhysicalAddress; } struct _QUEUE_HEAD *

13 years, 5 months

[janderwald] 51826: [USBEHCI] - Pass memory manager to USBQueue object - Fix bug in memory manager which did not check if an allocation equals page size - Implement interrupt queue head array with ...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri May 20 14:47:15 2011 New Revision: 51826 URL: http://svn.reactos.org/svn/reactos?rev=51826&view=rev Log: [USBEHCI] - Pass memory manager to USBQueue object - Fix bug in memory manager which did not check if an allocation equals page size - Implement interrupt queue head array with frequencys of 1ms up to 32ms - Store queue heads in the sync schedule array - WIP Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Fri May 20 14:47:15 2011 @@ -437,7 +437,7 @@ // // Initialize the UsbQueue now that we have an AdapterObject. // - Status = m_UsbQueue->Initialize(PUSBHARDWAREDEVICE(this), m_Adapter, NULL); + Status = m_UsbQueue->Initialize(PUSBHARDWAREDEVICE(this), m_Adapter, m_MemoryManager, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to Initialize the UsbQueue\n"); Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Fri May 20 14:47:15 2011 @@ -525,7 +525,8 @@ // Description: initializes the object virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, - PDMA_ADAPTER AdapterObject, + IN PDMA_ADAPTER AdapterObject, + IN PDMAMEMORYMANAGER MemManager, IN OPTIONAL PKSPIN_LOCK Lock) = 0; //----------------------------------------------------------------------------------------- Modified: branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] Fri May 20 14:47:15 2011 @@ -131,11 +131,12 @@ { ULONG Length, BlockCount, FreeIndex, StartPage, EndPage; KIRQL OldLevel; + ULONG BlocksPerPage; // // sanity checks // - ASSERT(Size < PAGE_SIZE); + ASSERT(Size <= PAGE_SIZE); //ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); // @@ -157,6 +158,11 @@ // acquire lock // KeAcquireSpinLock(m_Lock, &OldLevel); + + // + // helper variable + // + BlocksPerPage = PAGE_SIZE / m_BlockSize; // // start search @@ -202,6 +208,19 @@ // break; } + else if ((BlockCount == BlocksPerPage) && (FreeIndex % BlocksPerPage == 0)) + { + // + // the request equals PAGE_SIZE and is aligned at page boundary + // reserve block + // + RtlSetBits(&m_Bitmap, FreeIndex, BlockCount); + + // + // reserve block + // + break; + } else { // Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Fri May 20 14:47:15 2011 @@ -33,7 +33,7 @@ return m_Ref; } - virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN OPTIONAL PKSPIN_LOCK Lock); + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN PDMAMEMORYMANAGER MemManager, IN OPTIONAL PKSPIN_LOCK Lock); virtual ULONG GetPendingRequestCount(); virtual NTSTATUS AddUSBRequest(PURB Urb); virtual NTSTATUS AddUSBRequest(IUSBRequest * Request); @@ -47,13 +47,18 @@ virtual ~CUSBQueue(){} protected: - LONG m_Ref; - KSPIN_LOCK m_Lock; - PDMA_ADAPTER m_Adapter; - PQUEUE_HEAD AsyncListQueueHead; - LIST_ENTRY m_CompletedRequestAsyncList; - LIST_ENTRY m_PendingRequestAsyncList; - + LONG m_Ref; // reference count + KSPIN_LOCK m_Lock; // list lock + PDMA_ADAPTER m_Adapter; // dma adapter + PUSBHARDWAREDEVICE m_Hardware; // stores hardware object + PQUEUE_HEAD AsyncListQueueHead; // async queue head + LIST_ENTRY m_CompletedRequestAsyncList; // completed async request list + LIST_ENTRY m_PendingRequestAsyncList; // pending async request list + ULONG m_MaxPeriodicListEntries; // max perdiodic list entries + ULONG m_MaxPollingInterval; // max polling interval + PHYSICAL_ADDRESS m_SyncFrameListAddr; // physical address of sync frame list + PULONG m_SyncFrameList; // virtual address of sync frame list + PQUEUE_HEAD * m_SyncFrameListQueueHeads; // stores the frame list of queue head // queue head manipulation functions VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); @@ -69,6 +74,9 @@ // called when the completion queue is cleaned up VOID QueueHeadCleanup(PQUEUE_HEAD QueueHead); + + // intializes the sync schedule + NTSTATUS InitializeSyncSchedule(IN PUSBHARDWAREDEVICE Hardware, IN PDMAMEMORYMANAGER MemManager); }; //================================================================================================= @@ -93,7 +101,8 @@ NTSTATUS CUSBQueue::Initialize( IN PUSBHARDWAREDEVICE Hardware, - PDMA_ADAPTER AdapterObject, + IN PDMA_ADAPTER AdapterObject, + IN PDMAMEMORYMANAGER MemManager, IN OPTIONAL PKSPIN_LOCK Lock) { NTSTATUS Status = STATUS_SUCCESS; @@ -127,7 +136,139 @@ // InitializeListHead(&m_PendingRequestAsyncList); + // + // now initialize sync schedule + // + Status = InitializeSyncSchedule(Hardware, MemManager); + return Status; +} + +NTSTATUS +CUSBQueue::InitializeSyncSchedule( + IN PUSBHARDWAREDEVICE Hardware, + IN PDMAMEMORYMANAGER MemManager) +{ + PHYSICAL_ADDRESS QueueHeadPhysAddr; + NTSTATUS Status; + ULONG Index; + PQUEUE_HEAD QueueHead; + + // + // FIXME: check if smaller list sizes are supported + // + m_MaxPeriodicListEntries = 1024; + + // + // use polling scheme of 32ms + // + m_MaxPollingInterval = 32; + + // + // allocate dummy frame list array + // + m_SyncFrameListQueueHeads = (PQUEUE_HEAD*)ExAllocatePool(NonPagedPool, m_MaxPollingInterval * sizeof(PQUEUE_HEAD)); + if (!m_SyncFrameListQueueHeads) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + + // + // first allocate a page to hold the queue array + // + Status = MemManager->Allocate(m_MaxPeriodicListEntries * sizeof(PVOID), (PVOID*)&m_SyncFrameList, &m_SyncFrameListAddr); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate sync frame list array + // + DPRINT1("Failed to allocate sync frame list\n"); + ExFreePool(m_SyncFrameListQueueHeads); + ASSERT(FALSE); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // now allocate queue head descriptors for the polling interval + // + for(Index = 0; Index < m_MaxPeriodicListEntries; Index++) + { + // + // check if is inside our polling interrupt frequency window + // + if (Index < m_MaxPollingInterval) + { + // + // allocate queue head + // + Status = MemManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysAddr); + + // + // initialize queue head + // + QueueHead->HorizontalLinkPointer = TERMINATE_POINTER; + QueueHead->AlternateNextPointer = TERMINATE_POINTER; + QueueHead->NextPointer = TERMINATE_POINTER; + + // + // 1 for non high speed, 0 for high speed device + // + QueueHead->EndPointCharacteristics.ControlEndPointFlag = 0; + QueueHead->EndPointCharacteristics.HeadOfReclamation = FALSE; + QueueHead->EndPointCharacteristics.MaximumPacketLength = 64; + + // + // Set NakCountReload to max value possible + // + QueueHead->EndPointCharacteristics.NakCountReload = 0xF; + + // + // Get the Initial Data Toggle from the QEDT + // + QueueHead->EndPointCharacteristics.QEDTDataToggleControl = FALSE; + + // + // FIXME: check if High Speed Device + // + QueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; + QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x03; + QueueHead->Token.DWord = 0; + QueueHead->Token.Bits.InterruptOnComplete = FALSE; + QueueHead->PhysicalAddr = QueueHeadPhysAddr.LowPart; + + + // + // store in queue head array + // + m_SyncFrameListQueueHeads[Index] = QueueHead; + } + else + { + // + // get cached entry + // + QueueHead = m_SyncFrameListQueueHeads[m_MaxPeriodicListEntries % m_MaxPollingInterval]; + } + + // + // store entry + // + m_SyncFrameList[Index] = (QueueHead->PhysicalAddr | 0x2); + } + + // + // now set the sync base + // + Hardware->SetPeriodicListRegister(m_SyncFrameListAddr.LowPart); + + // + // sync frame list initialized + // + return STATUS_SUCCESS; } ULONG

13 years, 5 months

[tkreuzer] 51825: [GDI FONT DRIVER] - Allow to use non-unicode charsets (Marlett for example only has a symbol charset embedded) - Use a char bias when dealing with other charsets - Fixes Marlett b...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 19 21:57:49 2011 New Revision: 51825 URL: http://svn.reactos.org/svn/reactos?rev=51825&view=rev Log: [GDI FONT DRIVER] - Allow to use non-unicode charsets (Marlett for example only has a symbol charset embedded) - Use a char bias when dealing with other charsets - Fixes Marlett based nonclient buttons, when used as default driver in Windows Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Thu May 19 21:57:49 2011 @@ -138,7 +138,6 @@ pifi->rclFontBox.top = ftface->bbox.yMax; pifi->rclFontBox.bottom = ftface->bbox.yMin; - pifi->cKerningPairs = 0; pifi->ulPanoseCulture = FM_PANOSE_CULTURE_LATIN; /* Try to get OS/2 TrueType or OpenType metrics */ @@ -182,8 +181,8 @@ pifi->fwdStrikeoutPosition = pifi->fwdMacAscender / 3; pifi->fwdAveCharWidth = CalculateAveCharWidth(ftface); - /* Special characters (first and last char are already enumerated) */ - pifi->wcDefaultChar = 0x0020; + /* Special characters */ + pifi->wcDefaultChar = 0x001F; pifi->wcBreakChar = 0x0020; pifi->panose.bFamilyType = PAN_FAMILY_TEXT_DISPLAY; @@ -199,6 +198,14 @@ *(DWORD*)&pifi->achVendId = 'nknU'; } + + /* Copy unicode values to ansi values */ + pifi->chDefaultChar = (CHAR)pifi->wcDefaultChar; + pifi->chBreakChar = (CHAR)pifi->wcBreakChar; + pifi->chFirstChar = (CHAR)pifi->wcFirstChar; + if (pifi->wcFirstChar > 0xff) pifi->chFirstChar = 0xff; + pifi->chLastChar = (CHAR)pifi->wcLastChar; + if (pifi->wcLastChar > 0xff) pifi->chLastChar = 0xff; /* Try to get type1 info from freetype */ fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); @@ -334,7 +341,7 @@ { /* Add a new WCRUN */ cRuns++; - pGlyphSet->awcrun[cRuns - 1].wcLow = wcCurrent; + pGlyphSet->awcrun[cRuns - 1].wcLow = wcCurrent - pface->wcCharBias; pGlyphSet->awcrun[cRuns - 1].cGlyphs = 1; pGlyphSet->awcrun[cRuns - 1].phg = &phglyphs[i]; } @@ -399,9 +406,33 @@ { PFTFD_FACE pface; FT_Error fterror; - ULONG ulAccumCharWidth = 0; + ULONG ulEncoding, ulAccumCharWidth = 0; WCHAR wcCurrent, wcPrev; FT_UInt index; + + /* Try to load a unicode charmap */ + ulEncoding = FT_ENCODING_UNICODE; + fterror = FT_Select_Charmap(ftface, ulEncoding); + if (fterror) + { + /* Check if we have any charmaps at all */ + if (ftface->num_charmaps == 0) + { + WARN("There are no charmaps available!\n"); + return NULL; + } + + /* Load first charmap instead */ + ulEncoding = ftface->charmaps[0]->encoding; + fterror = FT_Select_Charmap(ftface, ulEncoding); + if (fterror) + { + WARN("Could not load a charmap\n"); + return NULL; + } + + TRACE("Loaded charmap with encoding %.4s\n", &ulEncoding); + } pface = EngAllocMem(FL_ZERO_MEMORY, sizeof(FTFD_FACE), 'dftF'); if (!pface) @@ -415,17 +446,13 @@ pface->iFace = iFace; pface->ftface = ftface; pface->cGlyphs = ftface->num_glyphs; + pface->ulEncoding = ulEncoding; + + /* Set char bias, FIXME: use lCharBias? other encodings? */ + pface->wcCharBias = ulEncoding == FT_ENCODING_MS_SYMBOL ? 0xf000 : 0; /* Get the font format */ pface->ulFontFormat = FtfdGetFontFormat(ftface); - - /* Load a unicode charmap */ - fterror = FT_Select_Charmap(ftface, FT_ENCODING_UNICODE); - if (fterror) - { - WARN("Could not load unicode charmap\n"); - return NULL; - } /* Start with 0 runs and 0 mappings */ pface->cMappings = 0; @@ -433,7 +460,7 @@ /* Loop through all character mappings */ wcPrev = wcCurrent = (WCHAR)FT_Get_First_Char(ftface, &index); - pface->ifiex.ifi.wcFirstChar = wcCurrent; + pface->ifiex.ifi.wcFirstChar = wcCurrent - pface->wcCharBias;; while (index) { /* Count the mapping */ @@ -448,7 +475,7 @@ } /* Save the last character */ - pface->ifiex.ifi.wcLastChar = wcPrev; + pface->ifiex.ifi.wcLastChar = wcPrev - pface->wcCharBias;; /* Initialize IFIMETRICS */ FtfdInitIfiMetrics(pface); Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Thu May 19 21:57:49 2011 @@ -94,6 +94,8 @@ ULONG cMappings; ULONG cRuns; ULONG ulFontRevision; + ULONG ulEncoding; + WCHAR wcCharBias; PWCHAR pwcReverseTable; FD_GLYPHSET *pGlyphSet; FD_KERNINGPAIR *pKerningPairs; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Thu May 19 21:57:49 2011 @@ -253,13 +253,15 @@ //pifi->fwdUnderscorePosition; pifi->fwdStrikeoutSize = GETW(&pOs2->yStrikeoutSize); pifi->fwdStrikeoutPosition = GETW(&pOs2->yStrikeoutPosition); + *(DWORD*)pifi->achVendId = *(DWORD*)pOs2->achVendID; + //pifi->ulPanoseCulture; + pifi->panose = *(PANOSE*)pOs2->panose; + + /* Get special characters */ pifi->wcFirstChar = GETW(&pOs2->usFirstCharIndex); pifi->wcLastChar = GETW(&pOs2->usLastCharIndex); pifi->wcDefaultChar = GETW(&pOs2->usDefaultChar); pifi->wcBreakChar = GETW(&pOs2->usBreakChar); - *(DWORD*)pifi->achVendId = *(DWORD*)pOs2->achVendID; - //pifi->ulPanoseCulture; - pifi->panose = *(PANOSE*)pOs2->panose; return TRUE; }

13 years, 5 months

[spetreolle] 51824: Add bootcdregtest target to cmake build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu May 19 21:55:57 2011 New Revision: 51824 URL: http://svn.reactos.org/svn/reactos?rev=51824&view=rev Log: Add bootcdregtest target to cmake build. Added: trunk/reactos/boot/bootdata/bootcd/unattend.inf - copied unchanged from r51800, trunk/reactos/boot/bootdata/unattend.inf Modified: trunk/reactos/CMakeMacros.cmake trunk/reactos/base/setup/usetup/CMakeLists.txt trunk/reactos/boot/CMakeLists.txt trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=5182… ============================================================================== --- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Thu May 19 21:55:57 2011 @@ -175,4 +175,32 @@ endif() endif() #end livecd + #do we add it to regtest? + list(FIND _CD_FOR regtest __cd) + if(NOT __cd EQUAL -1) + #whether or not we should put it in reactos.cab or directly on cd + if(_CD_NO_CAB) + #directly on cd + foreach(item ${_CD_FILE}) + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + endforeach() + if(_CD_NAME_ON_CD) + get_filename_component(__file ${_CD_FILE} NAME) + #rename it in the cd tree + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n") + endif() + if(_CD_TARGET) + #manage dependency + add_dependencies(bootcdregtest ${_CD_TARGET}) + endif() + else() + #add it in reactos.cab + #dir_to_num(${_CD_DESTINATION} _num) + #file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n") + #if(_CD_TARGET) + # #manage dependency + # add_dependencies(reactos_cab ${_CD_TARGET}) + #endif() + endif() + endif() #end bootcd endfunction() Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -44,4 +44,4 @@ set_module_type(usetup nativecui) add_importlibs(usetup kernel32 ntdll) -add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd) +add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest) Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=51… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -9,6 +9,18 @@ COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${CMAKE_CURRENT_BINARY_DIR}/bootcd REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso VERBATIM) +##bootcdregtest +#clear it out +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest)\n") + +add_custom_target(bootcdregtest + ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest + -P ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest REACTOS ${REACTOS_BINARY_DIR}/bootcdregtest.iso + VERBATIM) + + ##livecd #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -1,11 +1,11 @@ add_subdirectory(packages) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivecls.inf FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivedef.inf FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivecls.inf FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivedef.inf FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd regtest) # livecd hives list(APPEND CD_HIVES @@ -42,6 +42,10 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all) #freeldr.ini -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini FOR bootcd) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini FOR bootcd regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root NAME_ON_CD freeldr.ini FOR livecd) +#unattend +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) +#uncomment this for unattend bootcd +#add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/bootc… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] Thu May 19 21:55:57 2011 @@ -4,6 +4,7 @@ <if property="ARCH" value="i386"> <module name="bootcd" type="iso" output="ReactOS.iso"> <bootsector>isoboot</bootsector> +  </module> </if> <ifnot property="ARCH" value="i386"> Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -42,4 +42,4 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf VERBATIM) -add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd) +add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

13 years, 5 months

[gschneider] 51823: [shell32/shell32_new] Improve German translation

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu May 19 18:24:57 2011 New Revision: 51823 URL: http://svn.reactos.org/svn/reactos?rev=51823&view=rev Log: [shell32/shell32_new] Improve German translation Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu May 19 18:24:57 2011 @@ -55,7 +55,7 @@ MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT - MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Verknüpfung einfügen", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END @@ -721,7 +721,7 @@ IDS_SHELL_ABOUT_BACK "< &Zurück" FCIDM_SHVIEW_NEW "Neu" FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" - FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" + FCIDM_SHVIEW_NEWLINK "Neue &Verknüpfung" IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher" Modified: trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… ============================================================================== --- trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc [iso-8859-1] Thu May 19 18:24:57 2011 @@ -55,7 +55,7 @@ MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT - MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Verknüpfung einfügen", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END @@ -715,7 +715,7 @@ IDS_SHELL_ABOUT_BACK "< &Zurück" FCIDM_SHVIEW_NEW "Neu" FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" - FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" + FCIDM_SHVIEW_NEWLINK "Neue &Verknüpfung" IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher"

13 years, 5 months

[gschneider] 51822: [appwiz] Allow passing directories to the create new shortcut wizard See issue #6169 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu May 19 18:04:10 2011 New Revision: 51822 URL: http://svn.reactos.org/svn/reactos?rev=51822&view=rev Log: [appwiz] Allow passing directories to the create new shortcut wizard See issue #6169 for more details. Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Thu May 19 18:04:10 2011 @@ -340,7 +340,7 @@ } attrs = GetFileAttributesW(szPath); - if (attrs == INVALID_FILE_ATTRIBUTES || (attrs & FILE_ATTRIBUTE_DIRECTORY)) + if (attrs == INVALID_FILE_ATTRIBUTES) { /* invalid path */ return FALSE;

13 years, 5 months

← Newer
1
...
18
19
20
21
22
23
24
...
52
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 May 2011