Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[dquintana] 67474: [RAPPS_NEW] Continue the work converting the UI to using ATL-wrapped windows. CORE-9593 [RSHELL] [EXPLORER] Fixup two class declarations to work with the rosctrls.h changes.

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Apr 29 00:07:54 2015 New Revision: 67474 URL: http://svn.reactos.org/svn/reactos?rev=67474&view=rev Log: [RAPPS_NEW] Continue the work converting the UI to using ATL-wrapped windows. CORE-9593 [RSHELL] [EXPLORER] Fixup two class declarations to work with the rosctrls.h changes. Added: trunk/reactos/base/applications/rapps_new/crichedit.h (with props) Removed: trunk/reactos/base/applications/rapps_new/toolbar.cpp trunk/reactos/base/applications/rapps_new/treeview.cpp Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt trunk/reactos/base/applications/rapps_new/gui.cpp trunk/reactos/base/applications/rapps_new/rapps.h trunk/reactos/base/applications/rapps_new/winmain.cpp trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/base/shell/rshell/CMenuToolbars.h trunk/reactos/include/reactos/rosctrls.h Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -13,8 +13,6 @@ loaddlg.cpp misc.cpp settingsdlg.cpp - toolbar.cpp - treeview.cpp winmain.cpp rapps.h) Added: trunk/reactos/base/applications/rapps_new/crichedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/crichedit.h (added) +++ trunk/reactos/base/applications/rapps_new/crichedit.h [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -0,0 +1,98 @@ +#pragma once + +class CRichEdit : + public CWindow +{ +public: + VOID SetRangeFormatting(LONG Start, LONG End, DWORD dwEffects) + { + CHARFORMAT2 CharFormat; + + SendMessageW(EM_SETSEL, Start, End); + + ZeroMemory(&CharFormat, sizeof(CHARFORMAT2)); + + CharFormat.cbSize = sizeof(CHARFORMAT2); + CharFormat.dwMask = dwEffects; + CharFormat.dwEffects = dwEffects; + + SendMessageW(EM_SETCHARFORMAT, SCF_WORD | SCF_SELECTION, (LPARAM) &CharFormat); + + SendMessageW(EM_SETSEL, End, End + 1); + } + + LONG GetTextLen(VOID) + { + GETTEXTLENGTHEX TxtLenStruct; + + TxtLenStruct.flags = GTL_NUMCHARS; + TxtLenStruct.codepage = 1200; + + return (LONG) SendMessageW(EM_GETTEXTLENGTHEX, (WPARAM) &TxtLenStruct, 0); + } + + /* + * Insert text (without cleaning old text) + * Supported effects: + * - CFM_BOLD + * - CFM_ITALIC + * - CFM_UNDERLINE + * - CFM_LINK + */ + VOID InsertText(LPCWSTR lpszText, DWORD dwEffects) + { + SETTEXTEX SetText; + LONG Len = GetTextLen(); + + /* Insert new text */ + SetText.flags = ST_SELECTION; + SetText.codepage = 1200; + + SendMessageW(EM_SETTEXTEX, (WPARAM) &SetText, (LPARAM) lpszText); + + SetRangeFormatting(Len, Len + wcslen(lpszText), + (dwEffects == CFM_LINK) ? (PathIsURLW(lpszText) ? dwEffects : 0) : dwEffects); + } + + /* + * Clear old text and add new + */ + VOID SetText(LPCWSTR lpszText, DWORD dwEffects) + { + SetWindowTextW(L""); + InsertText(lpszText, dwEffects); + } + + HWND Create(HWND hwndParent) + { + // TODO: FreeLibrary when the window is destroyed + LoadLibraryW(L"riched20.dll"); + + m_hWnd = CreateWindowExW(0, + L"RichEdit20W", + NULL, + WS_CHILD | WS_VISIBLE | ES_MULTILINE | + ES_LEFT | ES_READONLY, + 205, 28, 465, 100, + hwndParent, + NULL, + _AtlBaseModule.GetModuleInstance(), + NULL); + + if (m_hWnd) + { + SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE)); + SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); + SendMessageW(EM_SETEVENTMASK, 0, ENM_LINK | ENM_MOUSEEVENTS); + SendMessageW(EM_SHOWSCROLLBAR, SB_VERT, TRUE); + } + + return m_hWnd; + } + +public: + virtual VOID OnLink(ENLINK *Link) + { + } + +}; Propchange: trunk/reactos/base/applications/rapps_new/crichedit.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps_new/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -17,155 +17,167 @@ #include <rosctrls.h> #include "rosui.h" - -PWSTR pLink = NULL; +#include "crichedit.h" + +#define SEARCH_TIMER_ID 'SR' HWND hListView = NULL; -VOID UpdateApplicationsList(INT EnumType); -VOID MainWndOnCommand(HWND hwnd, WPARAM wParam, LPARAM lParam); -BOOL IsSelectedNodeInstalled(void); -VOID FreeInstalledAppList(VOID); - -class CUiRichEdit : - public CUiWindow< CWindowImplBaseT<CWindow> > +class CMainToolbar : + public CUiWindow< CToolbar<> > { - BOOL ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId) - { - theResult = 0; - return FALSE; +#define TOOLBAR_HEIGHT 24 + + WCHAR szInstallBtn[MAX_STR_LEN]; + WCHAR szUninstallBtn[MAX_STR_LEN]; + WCHAR szModifyBtn[MAX_STR_LEN]; + + VOID AddImageToImageList(HIMAGELIST hImageList, UINT ImageIndex) + { + HICON hImage; + + if (!(hImage = (HICON) LoadImage(hInst, + MAKEINTRESOURCE(ImageIndex), + IMAGE_ICON, + TOOLBAR_HEIGHT, + TOOLBAR_HEIGHT, + 0))) + { + /* TODO: Error message */ + } + + ImageList_AddIcon(hImageList, hImage); + DeleteObject(hImage); + } + + HIMAGELIST InitImageList(VOID) + { + HIMAGELIST hImageList; + + /* Create the toolbar icon image list */ + hImageList = ImageList_Create(TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CXSMICON), + TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CYSMICON), + ILC_MASK | GetSystemColorDepth(), + 1, + 1); + if (!hImageList) + { + /* TODO: Error message */ + return NULL; + } + + AddImageToImageList(hImageList, IDI_INSTALL); + AddImageToImageList(hImageList, IDI_UNINSTALL); + AddImageToImageList(hImageList, IDI_MODIFY); + AddImageToImageList(hImageList, IDI_REFRESH); + AddImageToImageList(hImageList, IDI_SETTINGS); + AddImageToImageList(hImageList, IDI_EXIT); + + return hImageList; } public: - VOID SetRangeFormatting(LONG Start, LONG End, DWORD dwEffects) - { - CHARFORMAT2 CharFormat; - - SendMessageW(EM_SETSEL, Start, End); - - ZeroMemory(&CharFormat, sizeof(CHARFORMAT2)); - - CharFormat.cbSize = sizeof(CHARFORMAT2); - CharFormat.dwMask = dwEffects; - CharFormat.dwEffects = dwEffects; - - SendMessageW(EM_SETCHARFORMAT, SCF_WORD | SCF_SELECTION, (LPARAM) &CharFormat); - - SendMessageW(EM_SETSEL, End, End + 1); - } - - LONG GetTextLen(VOID) - { - GETTEXTLENGTHEX TxtLenStruct; - - TxtLenStruct.flags = GTL_NUMCHARS; - TxtLenStruct.codepage = 1200; - - return (LONG) SendMessageW(EM_GETTEXTLENGTHEX, (WPARAM) &TxtLenStruct, 0); - } - - /* - * Insert text (without cleaning old text) - * Supported effects: - * - CFM_BOLD - * - CFM_ITALIC - * - CFM_UNDERLINE - * - CFM_LINK - */ - VOID InsertText(LPCWSTR lpszText, DWORD dwEffects) - { - SETTEXTEX SetText; - LONG Len = GetTextLen(); - - /* Insert new text */ - SetText.flags = ST_SELECTION; - SetText.codepage = 1200; - - SendMessageW(EM_SETTEXTEX, (WPARAM) &SetText, (LPARAM) lpszText); - - SetRangeFormatting(Len, Len + wcslen(lpszText), - (dwEffects == CFM_LINK) ? (PathIsURLW(lpszText) ? dwEffects : 0) : dwEffects); - } - - /* - * Clear old text and add new - */ - VOID SetText(LPCWSTR lpszText, DWORD dwEffects) - { - SetWindowTextW(L""); - InsertText(lpszText, dwEffects); - } - - VOID OnLink(ENLINK *Link) - { - switch (Link->msg) - { - case WM_LBUTTONUP: - case WM_RBUTTONUP: - { - if (pLink) HeapFree(GetProcessHeap(), 0, pLink); - - pLink = (PWSTR) HeapAlloc(GetProcessHeap(), 0, - (max(Link->chrg.cpMin, Link->chrg.cpMax) - - min(Link->chrg.cpMin, Link->chrg.cpMax) + 1) * sizeof(WCHAR)); - if (!pLink) - { - /* TODO: Error message */ - return; - } - - SendMessageW(EM_SETSEL, Link->chrg.cpMin, Link->chrg.cpMax); - SendMessageW(EM_GETSELTEXT, 0, (LPARAM) pLink); - - ShowPopupMenu(m_hWnd, IDR_LINKMENU, -1); - } - break; + VOID OnGetDispInfo(LPTOOLTIPTEXT lpttt) + { + UINT idButton = (UINT) lpttt->hdr.idFrom; + + switch (idButton) + { + case ID_EXIT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); + break; + + case ID_INSTALL: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_INSTALL); + break; + + case ID_UNINSTALL: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UNINSTALL); + break; + + case ID_MODIFY: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_MODIFY); + break; + + case ID_SETTINGS: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SETTINGS); + break; + + case ID_REFRESH: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); + break; } } HWND Create(HWND hwndParent) { - LoadLibraryW(L"riched20.dll"); - - HWND hwnd = CreateWindowExW(0, - L"RichEdit20W", + static TBBUTTON Buttons [] = + { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + { 0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szInstallBtn }, + { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szUninstallBtn }, + { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn }, + { 5, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, + { 3, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 5, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, + { 4, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 5, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 } + }; + + INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); + HIMAGELIST hImageList; + + LoadStringW(hInst, IDS_INSTALL, szInstallBtn, sizeof(szInstallBtn) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, sizeof(szUninstallBtn) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_MODIFY, szModifyBtn, sizeof(szModifyBtn) / sizeof(WCHAR)); + + m_hWnd = CreateWindowExW(0, + TOOLBARCLASSNAMEW, NULL, - WS_CHILD | WS_VISIBLE | ES_MULTILINE | - ES_LEFT | ES_READONLY, - 205, 28, 465, 100, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_LIST, + 0, 0, 0, 0, hwndParent, - NULL, + 0, hInst, NULL); - - SubclassWindow(hwnd); - - if (hwnd) - { - SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE)); - SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - SendMessageW(EM_SETEVENTMASK, 0, ENM_LINK | ENM_MOUSEEVENTS); - SendMessageW(EM_SHOWSCROLLBAR, SB_VERT, TRUE); - } - - return hwnd; - } - + + if (!m_hWnd) + { + /* TODO: Show error message */ + return FALSE; + } + + SendMessageW(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); + SetButtonStructSize(); + + hImageList = InitImageList(); + + if (!hImageList) + { + /* TODO: Show error message */ + return FALSE; + } + + ImageList_Destroy((HIMAGELIST) SetImageList(hImageList)); + + AddButtons(NumButtons, Buttons); + + return m_hWnd; + } }; -class CUiListView : +class CAppsListView : public CUiWindow<CListView> { struct SortContext { - CUiListView * lvw; + CAppsListView * lvw; int iSubItem; }; public: BOOL bAscending; - CUiListView() + CAppsListView() { bAscending = TRUE; } @@ -281,26 +293,38 @@ }; -class CUiStatusBar : - public CUiWindow<CStatusBar> -{ -}; - -class CUiMainWindow : - public CWindowImpl<CUiMainWindow, CWindow, CFrameWinTraits> +class CMainWindow : + public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> { CUiPanel * m_ClientPanel; - - CUiWindow<> * m_Toolbar; - CUiWindow<> * m_TreeView; - CUiWindow<> * m_SearchBar; - CUiStatusBar * m_StatusBar; - CUiListView * m_ListView; - CUiRichEdit * m_RichEdit; CUiSplitPanel * m_VSplitter; CUiSplitPanel * m_HSplitter; + CMainToolbar * m_Toolbar; + CAppsListView * m_ListView; + + CUiWindow<CTreeView> * m_TreeView; + CUiWindow<CStatusBar> * m_StatusBar; + CUiWindow<CRichEdit> * m_RichEdit; + + CUiWindow<> * m_SearchBar; + HIMAGELIST hImageTreeView; + + PWSTR pLink; + + BOOL SearchEnabled; + +public: + CMainWindow() : + m_ClientPanel(NULL), + hImageTreeView(NULL), + pLink(NULL), + SearchEnabled(TRUE) + { + } + +private: VOID InitApplicationsList(VOID) { @@ -337,7 +361,7 @@ LoadStringW(hInst, TextIndex, szText, _countof(szText)); - return TreeViewAddItem(hRootItem, szText, Index, Index, TextIndex); + return m_TreeView->AddItem(hRootItem, szText, Index, Index, TextIndex); } VOID InitCategoriesList(VOID) @@ -365,17 +389,15 @@ AddCategory(hRootItem2, IDS_CAT_LIBS, IDI_CAT_LIBS); AddCategory(hRootItem2, IDS_CAT_OTHER, IDI_CAT_OTHER); - (VOID) TreeView_SetImageList(hTreeView, hImageTreeView, TVSIL_NORMAL); - - (VOID) TreeView_Expand(hTreeView, hRootItem2, TVE_EXPAND); - (VOID) TreeView_Expand(hTreeView, hRootItem1, TVE_EXPAND); - - (VOID) TreeView_SelectItem(hTreeView, hRootItem1); + m_TreeView->SetImageList(hImageTreeView, TVSIL_NORMAL); + m_TreeView->Expand(hRootItem2, TVE_EXPAND); + m_TreeView->Expand(hRootItem1, TVE_EXPAND); + m_TreeView->SelectItem(hRootItem1); } BOOL CreateStatusBar() { - m_StatusBar = new CUiStatusBar(); + m_StatusBar = new CUiWindow<CStatusBar>(); m_StatusBar->m_VerticalAlignment = UiAlign_RightBtm; m_StatusBar->m_HorizontalAlignment = UiAlign_Stretch; m_ClientPanel->Children().Append(m_StatusBar); @@ -385,35 +407,27 @@ BOOL CreateToolbar() { - // TODO: WRAPPER - m_Toolbar = new CUiWindow<>(); + m_Toolbar = new CMainToolbar(); m_Toolbar->m_VerticalAlignment = UiAlign_LeftTop; m_Toolbar->m_HorizontalAlignment = UiAlign_Stretch; m_ClientPanel->Children().Append(m_Toolbar); - - CreateToolBar(m_hWnd); - m_Toolbar->m_hWnd = hToolBar; - - return hToolBar != NULL; + + return m_Toolbar->Create(m_hWnd) != NULL; } BOOL CreateTreeView() { - // TODO: WRAPPER - m_TreeView = new CUiWindow<>(); + m_TreeView = new CUiWindow<CTreeView>(); m_TreeView->m_VerticalAlignment = UiAlign_Stretch; m_TreeView->m_HorizontalAlignment = UiAlign_Stretch; m_VSplitter->First().Append(m_TreeView); - - ::CreateTreeView(m_hWnd); - m_TreeView->m_hWnd = hTreeView; - - return hTreeView != NULL; + + return m_TreeView->Create(m_hWnd) != NULL; } BOOL CreateListView() { - m_ListView = new CUiListView(); + m_ListView = new CAppsListView(); m_ListView->m_VerticalAlignment = UiAlign_Stretch; m_ListView->m_HorizontalAlignment = UiAlign_Stretch; m_HSplitter->First().Append(m_ListView); @@ -424,7 +438,7 @@ BOOL CreateRichEdit() { - m_RichEdit = new CUiRichEdit(); + m_RichEdit = new CUiWindow<CRichEdit>(); m_RichEdit->m_VerticalAlignment = UiAlign_Stretch; m_RichEdit->m_HorizontalAlignment = UiAlign_Stretch; m_HSplitter->Second().Append(m_RichEdit); @@ -473,7 +487,7 @@ m_SearchBar->m_Margin.right = 6; //m_ClientPanel->Children().Append(m_SearchBar); - hSearchBar = CreateWindowExW(WS_EX_CLIENTEDGE, + HWND hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, WS_CHILD | WS_VISIBLE | ES_LEFT | ES_AUTOHSCROLL, @@ -486,14 +500,14 @@ hInst, 0); - m_SearchBar->m_hWnd = hSearchBar; + m_SearchBar->m_hWnd = hwnd; m_SearchBar->SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, sizeof(szBuf) / sizeof(WCHAR)); m_SearchBar->SetWindowTextW(szBuf); - return hSearchBar != NULL; + return hwnd != NULL; } BOOL CreateLayout() @@ -527,15 +541,13 @@ m_StatusBar->SendMessage(WM_SIZE, 0, 0); /* Size tool bar */ - SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); + m_Toolbar->AutoSize(); ::GetWindowRect(m_Toolbar->m_hWnd, &rTop); ::GetWindowRect(m_StatusBar->m_hWnd, &rBottom); - m_VSplitter->m_Margin.left = 3; - m_VSplitter->m_Margin.right = 3; - m_VSplitter->m_Margin.top = rTop.bottom - rTop.top + 3; - m_VSplitter->m_Margin.bottom = rBottom.bottom-rBottom.top + 3; + m_VSplitter->m_Margin.top = rTop.bottom - rTop.top; + m_VSplitter->m_Margin.bottom = rBottom.bottom-rBottom.top; } return b; @@ -573,7 +585,7 @@ m_StatusBar->SendMessage(WM_SIZE, 0, 0); /* Size tool bar */ - SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); + m_Toolbar->AutoSize(); RECT r = { 0, 0, LOWORD(lParam), HIWORD(lParam) }; @@ -624,7 +636,7 @@ } case WM_COMMAND: - MainWndOnCommand(hwnd, wParam, lParam); + OnCommand(wParam, lParam); break; case WM_NOTIFY: @@ -635,7 +647,7 @@ { case TVN_SELCHANGED: { - if (data->hwndFrom == hTreeView) + if (data->hwndFrom == m_TreeView->m_hWnd) { switch (((LPNMTREEVIEW) lParam)->itemNew.lParam) { @@ -733,10 +745,10 @@ EnableMenuItem(lvwMenu, ID_UNINSTALL, MF_ENABLED); EnableMenuItem(lvwMenu, ID_MODIFY, MF_ENABLED); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_REGREMOVE, TRUE); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_INSTALL, FALSE); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_UNINSTALL, TRUE); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_MODIFY, TRUE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_REGREMOVE, TRUE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_INSTALL, FALSE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_UNINSTALL, TRUE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_MODIFY, TRUE); } else { @@ -750,10 +762,10 @@ EnableMenuItem(lvwMenu, ID_UNINSTALL, MF_GRAYED); EnableMenuItem(lvwMenu, ID_MODIFY, MF_GRAYED); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_REGREMOVE, FALSE); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_INSTALL, TRUE); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_UNINSTALL, FALSE); - SendMessage(hToolBar, TB_ENABLEBUTTON, ID_MODIFY, FALSE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_REGREMOVE, FALSE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_INSTALL, TRUE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_UNINSTALL, FALSE); + m_Toolbar->SendMessage(TB_ENABLEBUTTON, ID_MODIFY, FALSE); } } break; @@ -827,11 +839,11 @@ break; case EN_LINK: - m_RichEdit->OnLink((ENLINK*) lParam); + OnLink((ENLINK*) lParam); break; case TTN_GETDISPINFO: - ToolBarOnGetDispInfo((LPTOOLTIPTEXT) lParam); + m_Toolbar->OnGetDispInfo((LPTOOLTIPTEXT) lParam); break; } } @@ -858,24 +870,351 @@ { /* Forward WM_SYSCOLORCHANGE to common controls */ m_ListView->SendMessage(WM_SYSCOLORCHANGE, 0, 0); - SendMessage(hTreeView, WM_SYSCOLORCHANGE, 0, 0); - SendMessage(hToolBar, WM_SYSCOLORCHANGE, 0, 0); + m_TreeView->SendMessage(WM_SYSCOLORCHANGE, 0, 0); + m_Toolbar->SendMessage(WM_SYSCOLORCHANGE, 0, 0); m_ListView->SendMessage(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE)); } break; + + case WM_TIMER: + if (wParam == SEARCH_TIMER_ID) + { + ::KillTimer(hwnd, SEARCH_TIMER_ID); + UpdateApplicationsList(-1); + } + break; } return FALSE; } + virtual VOID OnLink(ENLINK *Link) + { + switch (Link->msg) + { + case WM_LBUTTONUP: + case WM_RBUTTONUP: + { + if (pLink) HeapFree(GetProcessHeap(), 0, pLink); + + pLink = (PWSTR) HeapAlloc(GetProcessHeap(), 0, + (max(Link->chrg.cpMin, Link->chrg.cpMax) - + min(Link->chrg.cpMin, Link->chrg.cpMax) + 1) * sizeof(WCHAR)); + if (!pLink) + { + /* TODO: Error message */ + return; + } + + m_RichEdit->SendMessageW(EM_SETSEL, Link->chrg.cpMin, Link->chrg.cpMax); + m_RichEdit->SendMessageW(EM_GETSELTEXT, 0, (LPARAM) pLink); + + ShowPopupMenu(m_RichEdit->m_hWnd, IDR_LINKMENU, -1); + } + break; + } + } + + BOOL IsSelectedNodeInstalled(void) + { + HTREEITEM hSelectedItem = m_TreeView->GetSelection(); + TV_ITEM tItem; + + tItem.mask = TVIF_PARAM | TVIF_HANDLE; + tItem.hItem = hSelectedItem; + m_TreeView->GetItem(&tItem); + switch (tItem.lParam) + { + case IDS_INSTALLED: + case IDS_APPLICATIONS: + case IDS_UPDATES: + return TRUE; + default: + return FALSE; + } + } + + VOID OnCommand(WPARAM wParam, LPARAM lParam) + { + WORD wCommand = LOWORD(wParam); + + if (lParam == (LPARAM) m_SearchBar->m_hWnd) + { + WCHAR szBuf[MAX_STR_LEN]; + + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + { + WCHAR szWndText[MAX_STR_LEN]; + + LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); + GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); + if (wcscmp(szBuf, szWndText) == 0) + { + SearchEnabled = FALSE; + m_SearchBar->SetWindowTextW(L""); + } + } + break; + + case EN_KILLFOCUS: + { + GetWindowTextW(m_SearchBar->m_hWnd, szBuf, MAX_STR_LEN); + if (wcslen(szBuf) < 1) + { + LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); + SearchEnabled = FALSE; + m_SearchBar->SetWindowTextW(szBuf); + } + } + break; + + case EN_CHANGE: + { + WCHAR szWndText[MAX_STR_LEN]; + + if (!SearchEnabled) + { + SearchEnabled = TRUE; + break; + } + + LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); + GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); + if (wcscmp(szBuf, szWndText) != 0) + { + StringCbCopy(szSearchPattern, sizeof(szSearchPattern), + szWndText); + } + else + { + szSearchPattern[0] = UNICODE_NULL; + } + + DWORD dwDelay; + SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &dwDelay, 0); + SetTimer(SEARCH_TIMER_ID, dwDelay); + } + break; + } + + return; + } + + switch (wCommand) + { + case ID_OPEN_LINK: + ShellExecuteW(m_hWnd, L"open", pLink, NULL, NULL, SW_SHOWNOACTIVATE); + HeapFree(GetProcessHeap(), 0, pLink); + break; + + case ID_COPY_LINK: + CopyTextToClipboard(pLink); + HeapFree(GetProcessHeap(), 0, pLink); + break; + + case ID_SETTINGS: + CreateSettingsDlg(m_hWnd); + break; + + case ID_EXIT: + PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + break; + + case ID_INSTALL: + if (DownloadApplication(-1)) + /* TODO: Implement install dialog + * if (InstallApplication(-1)) + */ + UpdateApplicationsList(-1); + break; + + case ID_UNINSTALL: + if (UninstallApplication(-1, FALSE)) + UpdateApplicationsList(-1); + break; + + case ID_MODIFY: + if (UninstallApplication(-1, TRUE)) + UpdateApplicationsList(-1); + break; + + case ID_REGREMOVE: + RemoveAppFromRegistry(-1); + break; + + case ID_REFRESH: + UpdateApplicationsList(-1); + break; + + case ID_RESETDB: + UpdateAppsDB(); + UpdateApplicationsList(-1); + break; + + case ID_HELP: + MessageBoxW(m_hWnd, L"Help not implemented yet", NULL, MB_OK); + break; + + case ID_ABOUT: + ShowAboutDialog(); + break; + } + } + + VOID FreeInstalledAppList(VOID) + { + INT Count = ListView_GetItemCount(hListView) - 1; + PINSTALLED_INFO Info; + + while (Count >= 0) + { + Info = (PINSTALLED_INFO) ListViewGetlParam(Count); + if (Info) + { + RegCloseKey(Info->hSubKey); + HeapFree(GetProcessHeap(), 0, Info); + } + Count--; + } + } + + static BOOL SearchPatternMatch(PCWSTR szHaystack, PCWSTR szNeedle) + { + if (!*szNeedle) + return TRUE; + /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */ + return StrStrIW(szHaystack, szNeedle) != NULL; + } + + static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, PINSTALLED_INFO Info) + { + PINSTALLED_INFO ItemInfo; + WCHAR szText[MAX_PATH]; + INT Index; + + if (!SearchPatternMatch(lpName, szSearchPattern)) + { + RegCloseKey(Info->hSubKey); + return TRUE; + } + + ItemInfo = (PINSTALLED_INFO) HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); + if (!ItemInfo) + { + RegCloseKey(Info->hSubKey); + return FALSE; + } + + RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO)); + + Index = ListViewAddItem(ItemIndex, 0, lpName, (LPARAM) ItemInfo); + + /* Get version info */ + GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText); + ListView_SetItemText(hListView, Index, 1, szText); + + /* Get comments */ + GetApplicationString(ItemInfo->hSubKey, L"Comments", szText); + ListView_SetItemText(hListView, Index, 2, szText); + + return TRUE; + } + + static BOOL CALLBACK s_EnumAvailableAppProc(PAPPLICATION_INFO Info) + { + INT Index; + + if (!SearchPatternMatch(Info->szName, szSearchPattern) && + !SearchPatternMatch(Info->szDesc, szSearchPattern)) + { + return TRUE; + } + + /* Only add a ListView entry if... + - no RegName was supplied (so we cannot determine whether the application is installed or not) or + - a RegName was supplied and the application is not installed + */ + if (!*Info->szRegName || (!IsInstalledApplication(Info->szRegName, FALSE) && !IsInstalledApplication(Info->szRegName, TRUE))) + { + Index = ListViewAddItem(Info->Category, 0, Info->szName, (LPARAM) Info); + + ListView_SetItemText(hListView, Index, 1, Info->szVersion); + ListView_SetItemText(hListView, Index, 2, Info->szDesc); + } + + return TRUE; + } + + VOID UpdateApplicationsList(INT EnumType) + { + WCHAR szBuffer1[MAX_STR_LEN], szBuffer2[MAX_STR_LEN]; + HICON hIcon; + HIMAGELIST hImageListView; + + m_ListView->SendMessage(WM_SETREDRAW, FALSE, 0); + + if (EnumType == -1) EnumType = SelectedEnumType; + + if (IS_INSTALLED_ENUM(SelectedEnumType)) + FreeInstalledAppList(); + + (VOID) ListView_DeleteAllItems(hListView); + + /* Create image list */ + hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + GetSystemColorDepth() | ILC_MASK, + 0, 1); + + hIcon = (HICON) LoadImage(hInst, + MAKEINTRESOURCE(IDI_MAIN), + IMAGE_ICON, + LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + LR_CREATEDIBSECTION); + + ImageList_AddIcon(hImageListView, hIcon); + DestroyIcon(hIcon); + + if (IS_INSTALLED_ENUM(EnumType)) + { + /* Enum installed applications and updates */ + EnumInstalledApplications(EnumType, TRUE, s_EnumInstalledAppProc); + EnumInstalledApplications(EnumType, FALSE, s_EnumInstalledAppProc); + } + else if (IS_AVAILABLE_ENUM(EnumType)) + { + /* Enum availabled applications */ + EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); + } + + /* Set image list for ListView */ + hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); + + /* Destroy old image list */ + if (hImageListView) + ImageList_Destroy(hImageListView); + + SelectedEnumType = EnumType; + + LoadStringW(hInst, IDS_APPS_COUNT, szBuffer2, _countof(szBuffer2)); + StringCbPrintfW(szBuffer1, sizeof(szBuffer1), + szBuffer2, + ListView_GetItemCount(hListView)); + SetStatusBarText(szBuffer1); + + SetWelcomeText(); + + /* set automatic column width for program names if the list is not empty */ + if (ListView_GetItemCount(hListView) > 0) + ListView_SetColumnWidth(hListView, 0, LVSCW_AUTOSIZE); + + SendMessage(hListView, WM_SETREDRAW, TRUE, 0); + } + public: - CUiMainWindow() : - m_ClientPanel(NULL), - hImageTreeView(NULL) - { - - } - static ATL::CWndClassInfo& GetWndClassInfo() { DWORD csStyle = CS_VREDRAW |CS_HREDRAW; @@ -910,32 +1249,36 @@ return CWindowImpl::Create(NULL, r, szWindowName, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); } - CUiStatusBar * GetStatusBar() + CStatusBar * GetStatusBar() { return m_StatusBar; } - CUiListView * GetListView() + CAppsListView * GetListView() { return m_ListView; } - CUiRichEdit * GetRichEdit() + CRichEdit * GetRichEdit() { return m_RichEdit; } }; -CUiMainWindow * g_MainWindow; +CMainWindow * g_MainWindow; HWND CreateMainWindow() { - g_MainWindow = new CUiMainWindow(); + g_MainWindow = new CMainWindow(); return g_MainWindow->Create(); } DWORD_PTR ListViewGetlParam(INT item) { + if (item < 0) + { + item = g_MainWindow->GetListView()->GetSelectionMark(); + } return g_MainWindow->GetListView()->GetItemData(item); } Modified: trunk/reactos/base/applications/rapps_new/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -175,17 +175,6 @@ /* settingsdlg.c */ VOID CreateSettingsDlg(HWND hwnd); -/* toolbar.c */ -extern HWND hToolBar; -extern HWND hSearchBar; -BOOL CreateToolBar(HWND hwnd); -VOID ToolBarOnGetDispInfo(LPTOOLTIPTEXT lpttt); - -/* treeview.c */ -extern HWND hTreeView; -BOOL CreateTreeView(HWND hwnd); -HTREEITEM TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam); - /* gui.cpp */ HWND CreateMainWindow(); DWORD_PTR ListViewGetlParam(INT item); @@ -194,6 +183,11 @@ VOID NewRichEditText(PCWSTR szText, DWORD flags); VOID InsertRichEditText(PCWSTR szText, DWORD flags); extern HWND hListView; -extern PWSTR pLink; +extern WCHAR szSearchPattern[MAX_STR_LEN]; + +//extern HWND hTreeView; +//BOOL CreateTreeView(HWND hwnd); +//HTREEITEM TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam); + #endif /* _RAPPS_H */ Removed: trunk/reactos/base/applications/rapps_new/toolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/toolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/toolbar.cpp (removed) @@ -1,158 +0,0 @@ -/* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/toolbar.c - * PURPOSE: ToolBar functions - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - */ - -#include "rapps.h" - -#define TOOLBAR_HEIGHT 24 - -HWND hToolBar; -HWND hSearchBar; - -static WCHAR szInstallBtn[MAX_STR_LEN]; -static WCHAR szUninstallBtn[MAX_STR_LEN]; -static WCHAR szModifyBtn[MAX_STR_LEN]; - -/* Toolbar buttons */ -static const TBBUTTON Buttons[] = -{ /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - { 0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szInstallBtn}, - { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szUninstallBtn}, - { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szModifyBtn}, - { 5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, - { 3, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, - { 5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, - { 4, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, - { 5, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0} -}; - - -VOID -ToolBarOnGetDispInfo(LPTOOLTIPTEXT lpttt) -{ - UINT idButton = (UINT)lpttt->hdr.idFrom; - - switch (idButton) - { - case ID_EXIT: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); - break; - - case ID_INSTALL: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_INSTALL); - break; - - case ID_UNINSTALL: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UNINSTALL); - break; - - case ID_MODIFY: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_MODIFY); - break; - - case ID_SETTINGS: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SETTINGS); - break; - - case ID_REFRESH: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); - break; - } -} - -VOID -AddImageToImageList(HIMAGELIST hImageList, UINT ImageIndex) -{ - HICON hImage; - - if (!(hImage = (HICON) LoadImage(hInst, - MAKEINTRESOURCE(ImageIndex), - IMAGE_ICON, - TOOLBAR_HEIGHT, - TOOLBAR_HEIGHT, - 0))) - { - /* TODO: Error message */ - } - - ImageList_AddIcon(hImageList, hImage); - DeleteObject(hImage); -} - -HIMAGELIST -InitImageList(VOID) -{ - HIMAGELIST hImageList; - - /* Create the toolbar icon image list */ - hImageList = ImageList_Create(TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CXSMICON), - TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CYSMICON), - ILC_MASK | GetSystemColorDepth(), - 1, - 1); - if (!hImageList) - { - /* TODO: Error message */ - return NULL; - } - - AddImageToImageList(hImageList, IDI_INSTALL); - AddImageToImageList(hImageList, IDI_UNINSTALL); - AddImageToImageList(hImageList, IDI_MODIFY); - AddImageToImageList(hImageList, IDI_REFRESH); - AddImageToImageList(hImageList, IDI_SETTINGS); - AddImageToImageList(hImageList, IDI_EXIT); - - return hImageList; -} - -BOOL -CreateToolBar(HWND hwnd) -{ - INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); - HIMAGELIST hImageList; - - LoadStringW(hInst, IDS_INSTALL, szInstallBtn, sizeof(szInstallBtn) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, sizeof(szUninstallBtn) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_MODIFY, szModifyBtn, sizeof(szModifyBtn) / sizeof(WCHAR)); - - hToolBar = CreateWindowExW(0, - TOOLBARCLASSNAMEW, - NULL, - WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_LIST, - 0, 0, 0, 0, - hwnd, - 0, - hInst, - NULL); - - if (!hToolBar) - { - /* TODO: Show error message */ - return FALSE; - } - - SendMessageW(hToolBar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); - SendMessageW(hToolBar, TB_BUTTONSTRUCTSIZE, sizeof(Buttons[0]), 0); - - hImageList = InitImageList(); - - if (!hImageList) - { - /* TODO: Show error message */ - return FALSE; - } - - ImageList_Destroy((HIMAGELIST)SendMessageW(hToolBar, - TB_SETIMAGELIST, - 0, - (LPARAM)hImageList)); - - SendMessageW(hToolBar, TB_ADDBUTTONS, NumButtons, (LPARAM)Buttons); - - return TRUE; -} Removed: trunk/reactos/base/applications/rapps_new/treeview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/treeview.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/treeview.cpp (removed) @@ -1,53 +0,0 @@ -/* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/treeview.c - * PURPOSE: TreeView functions - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - */ - -#include "rapps.h" - -HWND hTreeView; - -HTREEITEM -TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam) -{ - TV_INSERTSTRUCTW Insert; - - ZeroMemory(&Insert, sizeof(TV_INSERTSTRUCT)); - - Insert.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - Insert.hInsertAfter = TVI_LAST; - Insert.hParent = hParent; - Insert.item.iSelectedImage = SelectedImage; - Insert.item.iImage = Image; - Insert.item.lParam = lParam; - Insert.item.pszText = lpText; - - return TreeView_InsertItem(hTreeView, &Insert); -} - -BOOL -CreateTreeView(HWND hwnd) -{ - hTreeView = CreateWindowExW(WS_EX_CLIENTEDGE, - WC_TREEVIEWW, - L"", - WS_CHILD | WS_VISIBLE | TVS_HASLINES | TVS_SHOWSELALWAYS, - 0, 28, 200, 350, - hwnd, - NULL, - hInst, - NULL); - - if (!hListView) - { - /* TODO: Show error message */ - return FALSE; - } - - SetFocus(hTreeView); - - return TRUE; -} Modified: trunk/reactos/base/applications/rapps_new/winmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/winmain.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/winmain.cpp [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -13,15 +13,12 @@ #include <atlcom.h> #include <shellapi.h> -#define SEARCH_TIMER_ID 'SR' - HWND hMainWnd; HINSTANCE hInst; INT SelectedEnumType = ENUM_ALL_COMPONENTS; SETTINGS_INFO SettingsInfo; WCHAR szSearchPattern[MAX_STR_LEN] = L""; -BOOL SearchEnabled = TRUE; class CRAppsModule : public CComModule { @@ -55,15 +52,6 @@ { gModule.Term(); } -} - -BOOL -SearchPatternMatch(PCWSTR szHaystack, PCWSTR szNeedle) -{ - if (!*szNeedle) - return TRUE; - /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */ - return StrStrIW(szHaystack, szNeedle) != NULL; } VOID @@ -132,309 +120,6 @@ { RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SETTINGS_INFO)); RegCloseKey(hKey); - } -} - -VOID -FreeInstalledAppList(VOID) -{ - INT Count = ListView_GetItemCount(hListView) - 1; - PINSTALLED_INFO Info; - - while (Count >= 0) - { - Info = (PINSTALLED_INFO)ListViewGetlParam(Count); - if (Info) - { - RegCloseKey(Info->hSubKey); - HeapFree(GetProcessHeap(), 0, Info); - } - Count--; - } -} - -BOOL -CALLBACK -EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, PINSTALLED_INFO Info) -{ - PINSTALLED_INFO ItemInfo; - WCHAR szText[MAX_PATH]; - INT Index; - - if (!SearchPatternMatch(lpName, szSearchPattern)) - { - RegCloseKey(Info->hSubKey); - return TRUE; - } - - ItemInfo = (PINSTALLED_INFO) HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); - if (!ItemInfo) - { - RegCloseKey(Info->hSubKey); - return FALSE; - } - - RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO)); - - Index = ListViewAddItem(ItemIndex, 0, lpName, (LPARAM)ItemInfo); - - /* Get version info */ - GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText); - ListView_SetItemText(hListView, Index, 1, szText); - - /* Get comments */ - GetApplicationString(ItemInfo->hSubKey, L"Comments", szText); - ListView_SetItemText(hListView, Index, 2, szText); - - return TRUE; -} - -BOOL -CALLBACK -EnumAvailableAppProc(PAPPLICATION_INFO Info) -{ - INT Index; - - if (!SearchPatternMatch(Info->szName, szSearchPattern) && - !SearchPatternMatch(Info->szDesc, szSearchPattern)) - { - return TRUE; - } - - /* Only add a ListView entry if... - - no RegName was supplied (so we cannot determine whether the application is installed or not) or - - a RegName was supplied and the application is not installed - */ - if (!*Info->szRegName || (!IsInstalledApplication(Info->szRegName, FALSE) && !IsInstalledApplication(Info->szRegName, TRUE))) - { - Index = ListViewAddItem(Info->Category, 0, Info->szName, (LPARAM)Info); - - ListView_SetItemText(hListView, Index, 1, Info->szVersion); - ListView_SetItemText(hListView, Index, 2, Info->szDesc); - } - - return TRUE; -} - -VOID -UpdateApplicationsList(INT EnumType) -{ - WCHAR szBuffer1[MAX_STR_LEN], szBuffer2[MAX_STR_LEN]; - HICON hIcon; - HIMAGELIST hImageListView; - - SendMessage(hListView, WM_SETREDRAW, FALSE, 0); - - if (EnumType == -1) EnumType = SelectedEnumType; - - if (IS_INSTALLED_ENUM(SelectedEnumType)) - FreeInstalledAppList(); - - (VOID) ListView_DeleteAllItems(hListView); - - /* Create image list */ - hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - GetSystemColorDepth() | ILC_MASK, - 0, 1); - - hIcon = (HICON)LoadImage(hInst, - MAKEINTRESOURCE(IDI_MAIN), - IMAGE_ICON, - LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - LR_CREATEDIBSECTION); - - ImageList_AddIcon(hImageListView, hIcon); - DestroyIcon(hIcon); - - if (IS_INSTALLED_ENUM(EnumType)) - { - /* Enum installed applications and updates */ - EnumInstalledApplications(EnumType, TRUE, EnumInstalledAppProc); - EnumInstalledApplications(EnumType, FALSE, EnumInstalledAppProc); - } - else if (IS_AVAILABLE_ENUM(EnumType)) - { - /* Enum availabled applications */ - EnumAvailableApplications(EnumType, EnumAvailableAppProc); - } - - /* Set image list for ListView */ - hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); - - /* Destroy old image list */ - if (hImageListView) - ImageList_Destroy(hImageListView); - - SelectedEnumType = EnumType; - - LoadStringW(hInst, IDS_APPS_COUNT, szBuffer2, _countof(szBuffer2)); - StringCbPrintfW(szBuffer1, sizeof(szBuffer1), - szBuffer2, - ListView_GetItemCount(hListView)); - SetStatusBarText(szBuffer1); - - SetWelcomeText(); - - /* set automatic column width for program names if the list is not empty */ - if (ListView_GetItemCount(hListView) > 0) - ListView_SetColumnWidth(hListView, 0, LVSCW_AUTOSIZE); - - SendMessage(hListView, WM_SETREDRAW, TRUE, 0); -} - -VOID CALLBACK -SearchTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) -{ - KillTimer(hwnd, SEARCH_TIMER_ID); - UpdateApplicationsList(-1); -} - -VOID -MainWndOnCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - WORD wCommand = LOWORD(wParam); - - if (lParam == (LPARAM)hSearchBar) - { - WCHAR szBuf[MAX_STR_LEN]; - - switch (HIWORD(wParam)) - { - case EN_SETFOCUS: - { - WCHAR szWndText[MAX_STR_LEN]; - - LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); - GetWindowTextW(hSearchBar, szWndText, MAX_STR_LEN); - if (wcscmp(szBuf, szWndText) == 0) - { - SearchEnabled = FALSE; - SetWindowTextW(hSearchBar, L""); - } - } - break; - - case EN_KILLFOCUS: - { - GetWindowTextW(hSearchBar, szBuf, MAX_STR_LEN); - if (wcslen(szBuf) < 1) - { - LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); - SearchEnabled = FALSE; - SetWindowTextW(hSearchBar, szBuf); - } - } - break; - - case EN_CHANGE: - { - WCHAR szWndText[MAX_STR_LEN]; - - if (!SearchEnabled) - { - SearchEnabled = TRUE; - break; - } - - LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); - GetWindowTextW(hSearchBar, szWndText, MAX_STR_LEN); - if (wcscmp(szBuf, szWndText) != 0) - { - StringCbCopy(szSearchPattern, sizeof(szSearchPattern), - szWndText); - } - else - { - szSearchPattern[0] = UNICODE_NULL; - } - - SetTimer(hwnd, SEARCH_TIMER_ID, 250, SearchTimerProc); - } - break; - } - - return; - } - - switch (wCommand) - { - case ID_OPEN_LINK: - ShellExecuteW(hwnd, L"open", pLink, NULL, NULL, SW_SHOWNOACTIVATE); - HeapFree(GetProcessHeap(), 0, pLink); - break; - - case ID_COPY_LINK: - CopyTextToClipboard(pLink); - HeapFree(GetProcessHeap(), 0, pLink); - break; - - case ID_SETTINGS: - CreateSettingsDlg(hwnd); - break; - - case ID_EXIT: - PostMessageW(hwnd, WM_CLOSE, 0, 0); - break; - - case ID_INSTALL: - if (DownloadApplication(-1)) - /* TODO: Implement install dialog - * if (InstallApplication(-1)) - */ - UpdateApplicationsList(-1); - break; - - case ID_UNINSTALL: - if (UninstallApplication(-1, FALSE)) - UpdateApplicationsList(-1); - break; - - case ID_MODIFY: - if (UninstallApplication(-1, TRUE)) - UpdateApplicationsList(-1); - break; - - case ID_REGREMOVE: - RemoveAppFromRegistry(-1); - break; - - case ID_REFRESH: - UpdateApplicationsList(-1); - break; - - case ID_RESETDB: - UpdateAppsDB(); - UpdateApplicationsList(-1); - break; - - case ID_HELP: - MessageBoxW(hwnd, L"Help not implemented yet", NULL, MB_OK); - break; - - case ID_ABOUT: - ShowAboutDialog(); - break; - } -} - -BOOL IsSelectedNodeInstalled(void) -{ - HTREEITEM hSelectedItem = TreeView_GetSelection(hTreeView); - TV_ITEM tItem; - - tItem.mask = TVIF_PARAM | TVIF_HANDLE; - tItem.hItem = hSelectedItem; - TreeView_GetItem(hTreeView, &tItem); - switch (tItem.lParam) - { - case IDS_INSTALLED: - case IDS_APPLICATIONS: - case IDS_UPDATES: - return TRUE; - default: - return FALSE; } } Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -103,7 +103,7 @@ } TASK_ITEM, *PTASK_ITEM; class CTaskToolbar : - public CToolbar<TASK_ITEM> + public CWindowImplBaseT< CToolbar<TASK_ITEM>, CControlWinTraits > { public: INT UpdateTbButtonSpacing(IN BOOL bHorizontal, IN BOOL bThemed, IN UINT uiRows = 0, IN UINT uiBtnsPerLine = 0) @@ -170,7 +170,7 @@ TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_LIST | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NODIVIDER; - return SubclassWindow(Create(hWndParent, styles)); + return SubclassWindow(CToolbar::Create(hWndParent, styles)); } }; Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -37,7 +37,7 @@ } SYS_PAGER_COPY_DATA, *PSYS_PAGER_COPY_DATA; class CNotifyToolbar : - public CToolbar<NOTIFYICONDATA> + public CWindowImplBaseT< CToolbar<NOTIFYICONDATA>, CControlWinTraits > { static const int ICON_SIZE = 16; @@ -367,7 +367,7 @@ TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER; - SubclassWindow(Create(hWndParent, styles)); + SubclassWindow(CToolbar::Create(hWndParent, styles)); SetWindowTheme(m_hWnd, L"TrayNotify", NULL); Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -383,7 +383,7 @@ rc.bottom = 1; } - SubclassWindow(Create(hwndParent, tbStyles, tbExStyles)); + SubclassWindow(CToolbar::Create(hwndParent, tbStyles, tbExStyles)); SetWindowTheme(m_hWnd, L"", L""); Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -26,7 +26,7 @@ #define WM_USER_CHANGETRACKEDITEM (WM_APP+42) class CMenuToolbarBase : - public CToolbar<DWORD_PTR> + public CWindowImplBaseT< CToolbar<DWORD_PTR>, CControlWinTraits > { CContainedWindow m_pager; private: Modified: trunk/reactos/include/reactos/rosctrls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosctrls.h… ============================================================================== --- trunk/reactos/include/reactos/rosctrls.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/rosctrls.h [iso-8859-1] Wed Apr 29 00:07:54 2015 @@ -190,9 +190,9 @@ DWORD_PTR GetItemData(int i) { - LVITEMW lvItem; + LVITEMW lvItem = { 0 }; + lvItem.mask = LVIF_PARAM; lvItem.iItem = i; - lvItem.mask = LVIF_PARAM; BOOL ret = GetItem(&lvItem); return (DWORD_PTR)(ret ? lvItem.lParam : NULL); } @@ -218,7 +218,7 @@ template<typename TItemData = DWORD_PTR> class CToolbar : - public CWindowImplBaseT<CWindow> + public CWindow { public: // Configuration methods @@ -415,14 +415,8 @@ }; class CStatusBar : - public CWindowImplBaseT<CWindow> + public CWindow { - BOOL ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId) - { - theResult = 0; - return FALSE; - } - public: VOID SetText(LPCWSTR lpszText) { @@ -431,7 +425,7 @@ HWND Create(HWND hwndParent, HMENU hMenu) { - HWND hwnd = CreateWindowExW(0, + m_hWnd = CreateWindowExW(0, STATUSCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP, @@ -440,8 +434,140 @@ hMenu, _AtlBaseModule.GetModuleInstance(), NULL); - SubclassWindow(hwnd); - return hwnd; + + return m_hWnd; } }; + +class CTreeView : + public CWindow +{ +public: + HWND Create(HWND hwndParent) + { + m_hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, + WC_TREEVIEWW, + L"", + WS_CHILD | WS_VISIBLE | TVS_HASLINES | TVS_SHOWSELALWAYS, + 0, 28, 200, 350, + hwndParent, + NULL, + _AtlBaseModule.GetModuleInstance(), + NULL); + + return m_hWnd; + } + + HTREEITEM AddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam) + { + TVINSERTSTRUCTW Insert; + + ZeroMemory(&Insert, sizeof(TV_INSERTSTRUCT)); + + Insert.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + Insert.hInsertAfter = TVI_LAST; + Insert.hParent = hParent; + Insert.item.iSelectedImage = SelectedImage; + Insert.item.iImage = Image; + Insert.item.lParam = lParam; + Insert.item.pszText = lpText; + + return InsertItem(&Insert); + } + + void SetRedraw(BOOL redraw) + { + SendMessage(WM_SETREDRAW, redraw); + } + + BOOL SetBkColor(COLORREF cr) + { + return (BOOL) SendMessage(TVM_SETBKCOLOR, 0, cr); + } + + BOOL SetTextColor(COLORREF cr) + { + return (BOOL) SendMessage(TVM_SETTEXTCOLOR, 0, cr); + } + + HIMAGELIST SetImageList(HIMAGELIST himl, int iImageList) + { + return (HIMAGELIST) SendMessage(TVM_SETIMAGELIST, iImageList, reinterpret_cast<LPARAM>(himl)); + } + + HTREEITEM InsertItem(const TVINSERTSTRUCTW * pitem) + { + return (HTREEITEM) SendMessage(TVM_INSERTITEM, 0, reinterpret_cast<LPARAM>(pitem)); + } + + BOOL DeleteItem(HTREEITEM i) + { + return (BOOL) SendMessage(TVM_DELETEITEM, 0, (LPARAM)i); + } + + BOOL GetItem(TV_ITEM* pitem) + { + return (BOOL) SendMessage(TVM_GETITEM, 0, reinterpret_cast<LPARAM>(pitem)); + } + + BOOL SetItem(const TV_ITEM * pitem) + { + return (BOOL) SendMessage(TVM_SETITEM, 0, reinterpret_cast<LPARAM>(pitem)); + } + + int GetItemCount() + { + return SendMessage(TVM_GETCOUNT); + } + + BOOL EnsureVisible(HTREEITEM i) + { + return (BOOL) SendMessage(TVM_ENSUREVISIBLE, 0, (LPARAM)i); + } + + HWND EditLabel(HTREEITEM i) + { + return (HWND) SendMessage(TVM_EDITLABEL, 0, (LPARAM)i); + } + + HTREEITEM GetNextItem(HTREEITEM i, WORD flags) + { + return (HTREEITEM)SendMessage(TVM_GETNEXTITEM, flags, (LPARAM)i); + } + + UINT GetItemState(int i, UINT mask) + { + return SendMessage(TVM_GETITEMSTATE, i, (LPARAM) mask); + } + + HTREEITEM HitTest(TVHITTESTINFO * phtInfo) + { + return (HTREEITEM) SendMessage(TVM_HITTEST, 0, reinterpret_cast<LPARAM>(phtInfo)); + } + + DWORD_PTR GetItemData(HTREEITEM item) + { + TVITEMW lvItem; + lvItem.hItem = item; + lvItem.mask = TVIF_PARAM; + BOOL ret = GetItem(&lvItem); + return (DWORD_PTR) (ret ? lvItem.lParam : NULL); + } + + HTREEITEM GetSelection() + { + return GetNextItem(NULL, TVGN_CARET); + } + + BOOL Expand(HTREEITEM item, DWORD action) + { + return SendMessage(TVM_EXPAND, action, (LPARAM)item); + } + + BOOL SelectItem(HTREEITEM item, DWORD action = TVGN_CARET) + { + return SendMessage(TVM_SELECTITEM, action, (LPARAM) item); + } + +};

9 years, 7 months

[tkreuzer] 67473: [NDK/KERNEL32] Improve definition of FIBER. Based on ks386.inc, ksarm.h and ksamd64.inc

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:27:35 2015 New Revision: 67473 URL: http://svn.reactos.org/svn/reactos?rev=67473&view=rev Log: [NDK/KERNEL32] Improve definition of FIBER. Based on ks386.inc, ksarm.h and ksamd64.inc Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c trunk/reactos/include/asm/ks386.template.h trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Tue Apr 28 21:27:35 2015 @@ -17,10 +17,10 @@ C_ASSERT(FIELD_OFFSET(FIBER, StackBase) == 0x08); C_ASSERT(FIELD_OFFSET(FIBER, StackLimit) == 0x0C); C_ASSERT(FIELD_OFFSET(FIBER, DeallocationStack) == 0x10); -C_ASSERT(FIELD_OFFSET(FIBER, Context) == 0x14); +C_ASSERT(FIELD_OFFSET(FIBER, FiberContext) == 0x14); C_ASSERT(FIELD_OFFSET(FIBER, GuaranteedStackBytes) == 0x2E0); C_ASSERT(FIELD_OFFSET(FIBER, FlsData) == 0x2E4); -C_ASSERT(FIELD_OFFSET(FIBER, ActivationContextStack) == 0x2E8); +C_ASSERT(FIELD_OFFSET(FIBER, ActivationContextStackPointer) == 0x2E8); #endif // _M_IX86 /* PRIVATE FUNCTIONS **********************************************************/ @@ -30,7 +30,7 @@ BaseRundownFls(IN PVOID FlsData) { /* No FLS support yet */ - + } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -106,20 +106,20 @@ } /* Copy some contextual data from the thread to the fiber */ - Fiber->Parameter = lpParameter; + Fiber->FiberData = lpParameter; Fiber->ExceptionList = Teb->NtTib.ExceptionList; Fiber->StackBase = Teb->NtTib.StackBase; Fiber->StackLimit = Teb->NtTib.StackLimit; Fiber->DeallocationStack = Teb->DeallocationStack; Fiber->FlsData = Teb->FlsData; Fiber->GuaranteedStackBytes = Teb->GuaranteedStackBytes; - Fiber->ActivationContextStack = Teb->ActivationContextStackPointer; - Fiber->Context.ContextFlags = CONTEXT_FULL; + Fiber->ActivationContextStackPointer = Teb->ActivationContextStackPointer; + Fiber->FiberContext.ContextFlags = CONTEXT_FULL; /* Save FPU State if requested */ if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) { - Fiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; + Fiber->FiberContext.ContextFlags |= CONTEXT_FLOATING_POINT; } /* Associate the fiber to the current thread */ @@ -168,7 +168,7 @@ PFIBER Fiber; NTSTATUS Status; INITIAL_TEB InitialTeb; - PACTIVATION_CONTEXT_STACK ActivationContextStack = NULL; + PACTIVATION_CONTEXT_STACK ActivationContextStackPointer = NULL; DPRINT("Creating Fiber\n"); /* Check for invalid flags */ @@ -180,7 +180,7 @@ } /* Allocate the Activation Context Stack */ - Status = RtlAllocateActivationContextStack(&ActivationContextStack); + Status = RtlAllocateActivationContextStack(&ActivationContextStackPointer); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -193,7 +193,7 @@ if (!Fiber) { /* Free the activation context stack */ - RtlFreeActivationContextStack(ActivationContextStack); + RtlFreeActivationContextStack(ActivationContextStackPointer); /* Fail */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -211,7 +211,7 @@ RtlFreeHeap(GetProcessHeap(), 0, Fiber); /* Free the activation context stack */ - RtlFreeActivationContextStack(ActivationContextStack); + RtlFreeActivationContextStack(ActivationContextStackPointer); /* Failure */ BaseSetLastNTError(Status); @@ -219,24 +219,24 @@ } /* Clear the context */ - RtlZeroMemory(&Fiber->Context, sizeof(CONTEXT)); + RtlZeroMemory(&Fiber->FiberContext, sizeof(CONTEXT)); /* Copy the data into the fiber */ Fiber->StackBase = InitialTeb.StackBase; Fiber->StackLimit = InitialTeb.StackLimit; Fiber->DeallocationStack = InitialTeb.AllocatedStackBase; - Fiber->Parameter = lpParameter; + Fiber->FiberData = lpParameter; Fiber->ExceptionList = EXCEPTION_CHAIN_END; Fiber->GuaranteedStackBytes = 0; Fiber->FlsData = NULL; - Fiber->ActivationContextStack = ActivationContextStack; - Fiber->Context.ContextFlags = CONTEXT_FULL; + Fiber->ActivationContextStackPointer = ActivationContextStackPointer; + Fiber->FiberContext.ContextFlags = CONTEXT_FULL; /* Save FPU State if requested */ - Fiber->Context.ContextFlags = (dwFlags & FIBER_FLAG_FLOAT_SWITCH) ? CONTEXT_FLOATING_POINT : 0; + Fiber->FiberContext.ContextFlags = (dwFlags & FIBER_FLAG_FLOAT_SWITCH) ? CONTEXT_FLOATING_POINT : 0; /* initialize the context for the fiber */ - BaseInitializeContext(&Fiber->Context, + BaseInitializeContext(&Fiber->FiberContext, lpParameter, lpStartAddress, InitialTeb.StackBase, @@ -271,7 +271,7 @@ if (Fiber->FlsData) BaseRundownFls(Fiber->FlsData); /* Get rid of the activation context stack */ - RtlFreeActivationContextStack(Fiber->ActivationContextStack); + RtlFreeActivationContextStack(Fiber->ActivationContextStackPointer); /* Free the fiber data */ RtlFreeHeap(GetProcessHeap(), 0, lpFiber); Modified: trunk/reactos/include/asm/ks386.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ks386.template… ============================================================================== --- trunk/reactos/include/asm/ks386.template.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/ks386.template.h [iso-8859-1] Tue Apr 28 21:27:35 2015 @@ -350,29 +350,29 @@ SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), HEADER("FIBER"), -OFFSET(FIBER_PARAMETER, FIBER, Parameter), +OFFSET(FIBER_PARAMETER, FIBER, FiberData), OFFSET(FIBER_EXCEPTION_LIST, FIBER, ExceptionList), OFFSET(FIBER_STACK_BASE, FIBER, StackBase), OFFSET(FIBER_STACK_LIMIT, FIBER, StackLimit), OFFSET(FIBER_DEALLOCATION_STACK, FIBER, DeallocationStack), -OFFSET(FIBER_CONTEXT, FIBER, Context), -OFFSET(FIBER_CONTEXT_FLAGS, FIBER, Context.ContextFlags), -OFFSET(FIBER_CONTEXT_EAX, FIBER, Context.Eax), -OFFSET(FIBER_CONTEXT_EBX, FIBER, Context.Ebx), -OFFSET(FIBER_CONTEXT_ECX, FIBER, Context.Ecx), -OFFSET(FIBER_CONTEXT_EDX, FIBER, Context.Edx), -OFFSET(FIBER_CONTEXT_ESI, FIBER, Context.Esi), -OFFSET(FIBER_CONTEXT_EDI, FIBER, Context.Edi), -OFFSET(FIBER_CONTEXT_EBP, FIBER, Context.Ebp), -OFFSET(FIBER_CONTEXT_EIP, FIBER, Context.Eip), -OFFSET(FIBER_CONTEXT_ESP, FIBER, Context.Esp), -OFFSET(FIBER_CONTEXT_DR6, FIBER, Context.Dr6), -OFFSET(FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD, FIBER, Context.FloatSave.ControlWord), -OFFSET(FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD, FIBER, Context.FloatSave.StatusWord), -OFFSET(FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD, FIBER, Context.FloatSave.TagWord), +OFFSET(FIBER_CONTEXT, FIBER, FiberContext), +OFFSET(FIBER_CONTEXT_FLAGS, FIBER, FiberContext.ContextFlags), +OFFSET(FIBER_CONTEXT_EAX, FIBER, FiberContext.Eax), +OFFSET(FIBER_CONTEXT_EBX, FIBER, FiberContext.Ebx), +OFFSET(FIBER_CONTEXT_ECX, FIBER, FiberContext.Ecx), +OFFSET(FIBER_CONTEXT_EDX, FIBER, FiberContext.Edx), +OFFSET(FIBER_CONTEXT_ESI, FIBER, FiberContext.Esi), +OFFSET(FIBER_CONTEXT_EDI, FIBER, FiberContext.Edi), +OFFSET(FIBER_CONTEXT_EBP, FIBER, FiberContext.Ebp), +OFFSET(FIBER_CONTEXT_EIP, FIBER, FiberContext.Eip), +OFFSET(FIBER_CONTEXT_ESP, FIBER, FiberContext.Esp), +OFFSET(FIBER_CONTEXT_DR6, FIBER, FiberContext.Dr6), +OFFSET(FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD, FIBER, FiberContext.FloatSave.ControlWord), +OFFSET(FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD, FIBER, FiberContext.FloatSave.StatusWord), +OFFSET(FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD, FIBER, FiberContext.FloatSave.TagWord), OFFSET(FIBER_GUARANTEED_STACK_BYTES, FIBER, GuaranteedStackBytes), OFFSET(FIBER_FLS_DATA, FIBER, FlsData), -OFFSET(FIBER_ACTIVATION_CONTEXT_STACK, FIBER, ActivationContextStack), +OFFSET(FIBER_ACTIVATION_CONTEXT_STACK, FIBER, ActivationContextStackPointer), HEADER("KTSS"), OFFSET(KTSS_IOMAPBASE, KTSS, IoMapBase), Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Tue Apr 28 21:27:35 2015 @@ -168,18 +168,25 @@ #define KI_EXCEPTION_INTERNAL 0x10000000 #define KI_EXCEPTION_ACCESS_VIOLATION (KI_EXCEPTION_INTERNAL | 0x04) -typedef struct _FIBER /* Field offsets: */ -{ /* 32 bit 64 bit */ - /* this must be the first field */ - PVOID Parameter; /* 0x00 0x00 */ - struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; /* 0x04 0x08 */ - PVOID StackBase; /* 0x08 0x10 */ - PVOID StackLimit; /* 0x0C 0x18 */ - PVOID DeallocationStack; /* 0x10 0x20 */ - CONTEXT Context; /* 0x14 0x28 */ - ULONG GuaranteedStackBytes; /* 0x2E0 */ - PVOID FlsData; /* 0x2E4 */ - struct _ACTIVATION_CONTEXT_STACK *ActivationContextStack;/* 0x2E8 */ +typedef struct _FIBER /* Field offsets: */ +{ /* i386 arm x64 */ + PVOID FiberData; /* 0x000 0x000 0x000 */ + struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;/* 0x004 0x004 0x008 */ + PVOID StackBase; /* 0x008 0x008 0x010 */ + PVOID StackLimit; /* 0x00C 0x00C 0x018 */ + PVOID DeallocationStack; /* 0x010 0x010 0x020 */ + CONTEXT FiberContext; /* 0x014 0x018 0x030 */ +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID Wx86Tib; /* 0x2E0 0x1b8 0x500 */ + struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer; /* 0x2E4 0x1bc 0x508 */ + PVOID FlsData; /* 0x2E8 0x1c0 0x510 */ + ULONG GuaranteedStackBytes; /* 0x2EC 0x1c4 0x518 */ + ULONG TebFlags; /* 0x2F0 0x1c8 0x51C */ +#else + ULONG GuaranteedStackBytes; /* 0x2E0 */ + PVOID FlsData; /* 0x2E4 */ + struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer; +#endif } FIBER, *PFIBER; #ifndef NTOS_MODE_USER

9 years, 7 months

[tkreuzer] 67472: [KERNEL32/NDK] Move definition of FIBER to NDK

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:27:16 2015 New Revision: 67472 URL: http://svn.reactos.org/svn/reactos?rev=67472&view=rev Log: [KERNEL32/NDK] Move definition of FIBER to NDK Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c trunk/reactos/include/asm/genincdata.c trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Tue Apr 28 21:27:16 2015 @@ -3,7 +3,7 @@ * PROJECT: ReactOS System Libraries * FILE: lib/kernel32/thread/fiber.c * PURPOSE: Fiber Implementation - * PROGRAMMERS: + * PROGRAMMERS: * Alex Ionescu (alex(a)relsoft.net) * KJK::Hyperion <noog(a)libero.it> */ @@ -12,19 +12,16 @@ #define NDEBUG #include <debug.h> -typedef struct _FIBER /* Field offsets: */ -{ /* 32 bit 64 bit */ - /* this must be the first field */ - PVOID Parameter; /* 0x00 0x00 */ - PEXCEPTION_REGISTRATION_RECORD ExceptionList; /* 0x04 0x08 */ - PVOID StackBase; /* 0x08 0x10 */ - PVOID StackLimit; /* 0x0C 0x18 */ - PVOID DeallocationStack; /* 0x10 0x20 */ - CONTEXT Context; /* 0x14 0x28 */ - ULONG GuaranteedStackBytes; /* 0x2E0 */ - PVOID FlsData; /* 0x2E4 */ - PACTIVATION_CONTEXT_STACK ActivationContextStack; /* 0x2E8 */ -} FIBER, *PFIBER; +#ifdef _M_IX86 +C_ASSERT(FIELD_OFFSET(FIBER, ExceptionList) == 0x04); +C_ASSERT(FIELD_OFFSET(FIBER, StackBase) == 0x08); +C_ASSERT(FIELD_OFFSET(FIBER, StackLimit) == 0x0C); +C_ASSERT(FIELD_OFFSET(FIBER, DeallocationStack) == 0x10); +C_ASSERT(FIELD_OFFSET(FIBER, Context) == 0x14); +C_ASSERT(FIELD_OFFSET(FIBER, GuaranteedStackBytes) == 0x2E0); +C_ASSERT(FIELD_OFFSET(FIBER, FlsData) == 0x2E4); +C_ASSERT(FIELD_OFFSET(FIBER, ActivationContextStack) == 0x2E8); +#endif // _M_IX86 /* PRIVATE FUNCTIONS **********************************************************/ @@ -76,7 +73,7 @@ */ LPVOID WINAPI -ConvertThreadToFiberEx(LPVOID lpParameter, +ConvertThreadToFiberEx(LPVOID lpParameter, DWORD dwFlags) { PTEB Teb; Modified: trunk/reactos/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/genincdata.c?r… ============================================================================== --- trunk/reactos/include/asm/genincdata.c [iso-8859-1] (original) +++ trunk/reactos/include/asm/genincdata.c [iso-8859-1] Tue Apr 28 21:27:16 2015 @@ -26,21 +26,6 @@ P4Home = 4 * sizeof(PVOID), }; #endif - -// FIXME: where to put this? -typedef struct _FIBER /* Field offsets: */ -{ /* 32 bit 64 bit */ - /* this must be the first field */ - PVOID Parameter; /* 0x00 0x00 */ - PEXCEPTION_REGISTRATION_RECORD ExceptionList; /* 0x04 0x08 */ - PVOID StackBase; /* 0x08 0x10 */ - PVOID StackLimit; /* 0x0C 0x18 */ - PVOID DeallocationStack; /* 0x10 0x20 */ - CONTEXT Context; /* 0x14 0x28 */ - ULONG GuaranteedStackBytes; /* 0x2E0 */ - PVOID FlsData; /* 0x2E4 */ - PVOID /* PACTIVATION_CONTEXT_STACK */ ActivationContextStack; /* 0x2E8 */ -} FIBER, *PFIBER; typedef struct { @@ -75,10 +60,8 @@ ASMGENDATA Table[] = { -#if defined (_M_IX86) || defined (_M_AMD64) /* PORTABLE CONSTANTS ********************************************************/ #include "ksx.template.h" -#endif /* ARCHITECTURE SPECIFIC CONTSTANTS ******************************************/ #ifdef _M_IX86 Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Tue Apr 28 21:27:16 2015 @@ -167,6 +167,20 @@ // #define KI_EXCEPTION_INTERNAL 0x10000000 #define KI_EXCEPTION_ACCESS_VIOLATION (KI_EXCEPTION_INTERNAL | 0x04) + +typedef struct _FIBER /* Field offsets: */ +{ /* 32 bit 64 bit */ + /* this must be the first field */ + PVOID Parameter; /* 0x00 0x00 */ + struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; /* 0x04 0x08 */ + PVOID StackBase; /* 0x08 0x10 */ + PVOID StackLimit; /* 0x0C 0x18 */ + PVOID DeallocationStack; /* 0x10 0x20 */ + CONTEXT Context; /* 0x14 0x28 */ + ULONG GuaranteedStackBytes; /* 0x2E0 */ + PVOID FlsData; /* 0x2E4 */ + struct _ACTIVATION_CONTEXT_STACK *ActivationContextStack;/* 0x2E8 */ +} FIBER, *PFIBER; #ifndef NTOS_MODE_USER //

9 years, 7 months

[tkreuzer] 67471: [NDK] - Move definition of TIMER_TABLE_ENTRY from ntoskrnl to NDK - Add definitions of KTIMER_TABLE, KDPC_LIST, SYNCH_COUNTERS

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:26:56 2015 New Revision: 67471 URL: http://svn.reactos.org/svn/reactos?rev=67471&view=rev Log: [NDK] - Move definition of TIMER_TABLE_ENTRY from ntoskrnl to NDK - Add definitions of KTIMER_TABLE, KDPC_LIST, SYNCH_COUNTERS Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Tue Apr 28 21:26:56 2015 @@ -906,21 +906,6 @@ ULONG64 Return; } KSWITCH_FRAME, *PKSWITCH_FRAME; -#if 0 -typedef struct _KTIMER_TABLE_ENTRY -{ - ULONG_PTR Lock; - LIST_ENTRY Entry; - ULARGE_INTEGER Time; -} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; - -typedef struct _KTIMER_TABLE -{ - KTIMER* TimerExpiry[64]; - KTIMER_TABLE_ENTRY TimerEntries[256]; -} KTIMER_TABLE, *PKTIMER_TABLE; -#endif - // // Inline function to get current KPRCB // Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Tue Apr 28 21:26:56 2015 @@ -629,19 +629,97 @@ InsertApcEnvironment } KAPC_ENVIRONMENT; +typedef struct _KTIMER_TABLE_ENTRY +{ +#if (NTDDI_VERSION >= NTDDI_LONGHORN) || defined(_M_ARM) || defined(_M_AMD64) + KSPIN_LOCK Lock; +#endif + LIST_ENTRY Entry; + ULARGE_INTEGER Time; +} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; + +typedef struct _KTIMER_TABLE +{ + PKTIMER TimerExpiry[64]; + KTIMER_TABLE_ENTRY TimerEntries[256]; +} KTIMER_TABLE, *PKTIMER_TABLE; + +typedef struct _KDPC_LIST +{ + SINGLE_LIST_ENTRY ListHead; + SINGLE_LIST_ENTRY* LastEntry; +} KDPC_LIST, *PKDPC_LIST; + +typedef struct _SYNCH_COUNTERS +{ + ULONG SpinLockAcquireCount; + ULONG SpinLockContentionCount; + ULONG SpinLockSpinCount; + ULONG IpiSendRequestBroadcastCount; + ULONG IpiSendRequestRoutineCount; + ULONG IpiSendSoftwareInterruptCount; + ULONG ExInitializeResourceCount; + ULONG ExReInitializeResourceCount; + ULONG ExDeleteResourceCount; + ULONG ExecutiveResourceAcquiresCount; + ULONG ExecutiveResourceContentionsCount; + ULONG ExecutiveResourceReleaseExclusiveCount; + ULONG ExecutiveResourceReleaseSharedCount; + ULONG ExecutiveResourceConvertsCount; + ULONG ExAcqResExclusiveAttempts; + ULONG ExAcqResExclusiveAcquiresExclusive; + ULONG ExAcqResExclusiveAcquiresExclusiveRecursive; + ULONG ExAcqResExclusiveWaits; + ULONG ExAcqResExclusiveNotAcquires; + ULONG ExAcqResSharedAttempts; + ULONG ExAcqResSharedAcquiresExclusive; + ULONG ExAcqResSharedAcquiresShared; + ULONG ExAcqResSharedAcquiresSharedRecursive; + ULONG ExAcqResSharedWaits; + ULONG ExAcqResSharedNotAcquires; + ULONG ExAcqResSharedStarveExclusiveAttempts; + ULONG ExAcqResSharedStarveExclusiveAcquiresExclusive; + ULONG ExAcqResSharedStarveExclusiveAcquiresShared; + ULONG ExAcqResSharedStarveExclusiveAcquiresSharedRecursive; + ULONG ExAcqResSharedStarveExclusiveWaits; + ULONG ExAcqResSharedStarveExclusiveNotAcquires; + ULONG ExAcqResSharedWaitForExclusiveAttempts; + ULONG ExAcqResSharedWaitForExclusiveAcquiresExclusive; + ULONG ExAcqResSharedWaitForExclusiveAcquiresShared; + ULONG ExAcqResSharedWaitForExclusiveAcquiresSharedRecursive; + ULONG ExAcqResSharedWaitForExclusiveWaits; + ULONG ExAcqResSharedWaitForExclusiveNotAcquires; + ULONG ExSetResOwnerPointerExclusive; + ULONG ExSetResOwnerPointerSharedNew; + ULONG ExSetResOwnerPointerSharedOld; + ULONG ExTryToAcqExclusiveAttempts; + ULONG ExTryToAcqExclusiveAcquires; + ULONG ExBoostExclusiveOwner; + ULONG ExBoostSharedOwners; + ULONG ExEtwSynchTrackingNotificationsCount; + ULONG ExEtwSynchTrackingNotificationsAccountedCount; +} SYNCH_COUNTERS, *PSYNCH_COUNTERS; + // // PRCB DPC Data // typedef struct _KDPC_DATA { +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + KDPC_LIST DpcList; +#else LIST_ENTRY DpcListHead; +#endif ULONG_PTR DpcLock; -#ifdef _M_AMD64 +#if defined(_M_AMD64) || defined(_M_ARM) volatile LONG DpcQueueDepth; #else volatile ULONG DpcQueueDepth; #endif ULONG DpcCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) || defined(_M_ARM) + PKDPC ActiveDpc; +#endif } KDPC_DATA, *PKDPC_DATA; // Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Apr 28 21:26:56 2015 @@ -53,12 +53,6 @@ LONGLONG TSCDelta; ULONG MHz; } KI_SAMPLE_MAP, *PKI_SAMPLE_MAP; - -typedef struct _KTIMER_TABLE_ENTRY -{ - LIST_ENTRY Entry; - ULARGE_INTEGER Time; -} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; #define MAX_TIMER_DPCS 16

9 years, 7 months

[tkreuzer] 67470: [NDK] Use portable definitions for service table constants. (Moved from ARM specific definition in ntoskrnl internal header, with a fixed value for TABLE_NUMBER_BITS, which is 1, ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:26:37 2015 New Revision: 67470 URL: http://svn.reactos.org/svn/reactos?rev=67470&view=rev Log: [NDK] Use portable definitions for service table constants. (Moved from ARM specific definition in ntoskrnl internal header, with a fixed value for TABLE_NUMBER_BITS, which is 1, not 3) Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/i386/asm.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Tue Apr 28 21:26:37 2015 @@ -157,15 +157,6 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 - -// -// Service Table -// -#define NUMBER_SERVICE_TABLES 2 -#define SERVICE_NUMBER_MASK 0xFFF -#define SERVICE_TABLE_SHIFT 7 -#define SERVICE_TABLE_MASK 0x20 -#define SERVICE_TABLE_TEST 0x20 // // HAL Variables Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Tue Apr 28 21:26:37 2015 @@ -611,11 +611,6 @@ // // System Call Table definitions // -#define NUMBER_SERVICE_TABLES 0x0002 -#define SERVICE_NUMBER_MASK 0x0FFF -#define SERVICE_TABLE_SHIFT 0x0008 -#define SERVICE_TABLE_MASK 0x0010 -#define SERVICE_TABLE_TEST 0x0010 #define SERVICE_DESCRIPTOR_BASE 0x0000 #define SERVICE_DESCRIPTOR_COUNT 0x0004 #define SERVICE_DESCRIPTOR_LIMIT 0x0008 Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Tue Apr 28 21:26:37 2015 @@ -28,6 +28,66 @@ #include <potypes.h> #include <ifssupp.h> #endif + +// +// A system call ID is formatted as such: +// .________________________________________________________________. +// | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | +// |--------------|-------------------------------------------------| +// | TABLE NUMBER | TABLE OFFSET | +// \----------------------------------------------------------------/ +// +// The table number is then used as an index into the service descriptor table. +#define TABLE_NUMBER_BITS 1 +#define TABLE_OFFSET_BITS 12 + +// +// There are 2 tables (kernel and shadow, used by Win32K) +// +#define NUMBER_SERVICE_TABLES 2 +#define NTOS_SERVICE_INDEX 0 +#define WIN32K_SERVICE_INDEX 1 + +// +// NB. From assembly code, the table number must be computed as an offset into +// the service descriptor table. +// +// Each entry into the table is 16 bytes long on 32-bit architectures, and +// 32 bytes long on 64-bit architectures. +// +// Thus, Table Number 1 is offset 16 (0x10) on x86, and offset 32 (0x20) on +// x64. +// +#ifdef _WIN64 +#define BITS_PER_ENTRY 5 // (1 << 5) = 32 bytes +#else +#define BITS_PER_ENTRY 4 // (1 << 4) = 16 bytes +#endif + +// +// We want the table number, but leave some extra bits to we can have the offset +// into the descriptor table. +// +#define SERVICE_TABLE_SHIFT (12 - BITS_PER_ENTRY) + +// +// Now the table number (as an offset) is corrupted with part of the table offset +// This mask will remove the extra unwanted bits, and give us the offset into the +// descriptor table proper. +// +#define SERVICE_TABLE_MASK (((1 << TABLE_NUMBER_BITS) - 1) << BITS_PER_ENTRY) + +// +// To get the table offset (ie: the service call number), just keep the 12 bits +// +#define SERVICE_NUMBER_MASK ((1 << TABLE_OFFSET_BITS) - 1) + +// +// We'll often need to check if this is a graphics call. This is done by comparing +// the table number offset with the known Win32K table number offset. +// This is usually index 1, so table number offset 0x10 (x86) or 0x20 (x64) +// +#define SERVICE_TABLE_TEST (WIN32K_SERVICE_INDEX << BITS_PER_ENTRY) // // Context Record Flags Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Apr 28 21:26:37 2015 @@ -159,70 +159,6 @@ /* One of the Reserved Wait Blocks, this one is for the Thread's Timer */ #define TIMER_WAIT_BLOCK 0x3L -#ifdef _M_ARM // FIXME: remove this once our headers are cleaned up -// -// A system call ID is formatted as such: -// .________________________________________________________________. -// | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | -// |--------------|-------------------------------------------------| -// | TABLE NUMBER | TABLE OFFSET | -// \----------------------------------------------------------------/ -// -// -// The table number is then used as an index into the service descriptor table. -#define TABLE_NUMBER_BITS 3 -#define TABLE_OFFSET_BITS 12 - -// -// There are 2 tables (kernel and shadow, used by Win32K) -// -#define NUMBER_SERVICE_TABLES 2 -#define NTOS_SERVICE_INDEX 0 -#define WIN32K_SERVICE_INDEX 1 - -// -// NB. From assembly code, the table number must be computed as an offset into -// the service descriptor table. -// -// Each entry into the table is 16 bytes long on 32-bit architectures, and -// 32 bytes long on 64-bit architectures. -// -// Thus, Table Number 1 is offset 16 (0x10) on x86, and offset 32 (0x20) on -// x64. -// -#ifdef _WIN64 -#define BITS_PER_ENTRY 5 // (1 << 5) = 32 bytes -#else -#define BITS_PER_ENTRY 4 // (1 << 4) = 16 bytes -#endif - -// -// We want the table number, but leave some extra bits to we can have the offset -// into the descriptor table. -// -#define SERVICE_TABLE_SHIFT (12 - BITS_PER_ENTRY) - -// -// Now the table number (as an offset) is corrupted with part of the table offset -// This mask will remove the extra unwanted bits, and give us the offset into the -// descriptor table proper. -// -#define SERVICE_TABLE_MASK (((1 << TABLE_NUMBER_BITS) - 1) << BITS_PER_ENTRY) - -// -// To get the table offset (ie: the service call number), just keep the 12 bits -// -#define SERVICE_NUMBER_MASK ((1 << TABLE_OFFSET_BITS) - 1) - -// -// We'll often need to check if this is a graphics call. This is done by comparing -// the table number offset with the known Win32K table number offset. -// This is usually index 1, so table number offset 0x10 (x86) or 0x20 (x64) -// -#define SERVICE_TABLE_TEST (WIN32K_SERVICE_INDEX << BITS_PER_ENTRY) - -#endif - #define KTS_SYSCALL_BIT (((KTRAP_STATE_BITS) { { .SystemCall = TRUE } }).Bits) #define KTS_PM_BIT (((KTRAP_STATE_BITS) { { .PreviousMode = TRUE } }).Bits) #define KTS_SEG_BIT (((KTRAP_STATE_BITS) { { .Segments = TRUE } }).Bits)

9 years, 7 months

[tkreuzer] 67469: [NDK] - Move _MMPTE definition to arch specific files - Fix _MMPTE_HARDWARE on arm (struct, not union!)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:26:15 2015 New Revision: 67469 URL: http://svn.reactos.org/svn/reactos?rev=67469&view=rev Log: [NDK] - Move _MMPTE definition to arch specific files - Fix _MMPTE_HARDWARE on arm (struct, not union!) Modified: trunk/reactos/include/ndk/amd64/mmtypes.h trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -208,6 +208,24 @@ #endif } MMPTE_HARDWARE_LARGEPAGE, *PMMPTE_HARDWARE_LARGEPAGE; +typedef struct _MMPTE +{ + union + { + ULONG_PTR Long; + HARDWARE_PTE Flush; + MMPTE_HARDWARE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + } u; +} MMPTE, *PMMPTE, + MMPDE, *PMMPDE, + MMPPE, *PMMPPE, + MMPXE, *PMMPXE; + #ifdef __cplusplus }; // extern "C" #endif Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -164,7 +164,7 @@ ULONG Prototype:1; } MMPTE_LIST; -typedef union _MMPTE_HARDWARE +typedef struct _MMPTE_HARDWARE { ULONG NoExecute:1; ULONG Valid:1; @@ -178,6 +178,28 @@ ULONG NonGlobal:1; ULONG PageFrameNumber:20; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; + + +// +// Use the right PTE structure +// +#define HARDWARE_PTE HARDWARE_PTE_ARMV6 +#define PHARDWARE_PTE PHARDWARE_PTE_ARMV6 + +typedef struct _MMPTE +{ + union + { + ULONG_PTR Long; + HARDWARE_PTE Flush; + MMPTE_HARDWARE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + } u; +} MMPTE, *PMMPTE; typedef union _MMPDE_HARDWARE { @@ -200,12 +222,6 @@ } u; } MMPDE, *PMMPDE; -// -// Use the right PTE structure -// -#define HARDWARE_PTE HARDWARE_PTE_ARMV6 -#define PHARDWARE_PTE PHARDWARE_PTE_ARMV6 - #ifdef __cplusplus }; // extern "C" #endif Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -181,6 +181,22 @@ #define HARDWARE_PTE HARDWARE_PTE_X86 #define PHARDWARE_PTE PHARDWARE_PTE_X86 +typedef struct _MMPTE +{ + union + { + ULONG_PTR Long; + HARDWARE_PTE Flush; + MMPTE_HARDWARE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + } u; +} MMPTE, *PMMPTE, + MMPDE, *PMMPDE; + #ifdef __cplusplus }; // extern "C" #endif Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -375,24 +375,6 @@ } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; #ifndef NTOS_MODE_USER - -// -// PTE Structures -// -typedef struct _MMPTE -{ - union - { - ULONG_PTR Long; - HARDWARE_PTE Flush; - MMPTE_HARDWARE Hard; - MMPTE_PROTOTYPE Proto; - MMPTE_SOFTWARE Soft; - MMPTE_TRANSITION Trans; - MMPTE_SUBSECTION Subsect; - MMPTE_LIST List; - } u; -} MMPTE, *PMMPTE; // // Section Extension Information

9 years, 7 months

[tkreuzer] 67468: [PSDK] Update sdkddkver.h with latest version constants up to windows 10.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:25:57 2015 New Revision: 67468 URL: http://svn.reactos.org/svn/reactos?rev=67468&view=rev Log: [PSDK] Update sdkddkver.h with latest version constants up to windows 10. Modified: trunk/reactos/include/psdk/sdkddkver.h Modified: trunk/reactos/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkver.h?r… ============================================================================== --- trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] Tue Apr 28 21:25:57 2015 @@ -25,6 +25,10 @@ #define _WIN32_WINNT_WS08 0x0600 #define _WIN32_WINNT_LONGHORN 0x0600 #define _WIN32_WINNT_WIN7 0x0601 +#define _WIN32_WINNT_WIN8 0x0602 +#define _WIN32_WINNT_WINBLUE 0x0603 +#define _WIN32_WINNT_WINTHRESHOLD 0x0A00 +#define _WIN32_WINNT_WIN10 0x0A00 /* _WIN32_IE */ #define _WIN32_IE_IE20 0x0200 @@ -40,6 +44,9 @@ #define _WIN32_IE_IE60SP2 0x0603 #define _WIN32_IE_IE70 0x0700 #define _WIN32_IE_IE80 0x0800 +#define _WIN32_IE_IE90 0x0900 +#define _WIN32_IE_IE100 0x0A00 +#define _WIN32_IE_IE110 0x0A00 /* Mappings Between IE Version and Windows Version */ #define _WIN32_IE_NT4 _WIN32_IE_IE20 @@ -65,6 +72,10 @@ #define _WIN32_IE_WIN6 _WIN32_IE_IE70 #define _WIN32_IE_LONGHORN _WIN32_IE_IE70 #define _WIN32_IE_WIN7 _WIN32_IE_IE80 +#define _WIN32_IE_WIN8 _WIN32_IE_IE100 +#define _WIN32_IE_WINBLUE _WIN32_IE_IE100 +#define _WIN32_IE_WINTHRESHOLD _WIN32_IE_IE110 +#define _WIN32_IE_WIN10 _WIN32_IE_IE110 /* NTDDI_VERSION */ #define NTDDI_WIN2K 0x05000000 @@ -99,6 +110,9 @@ #define NTDDI_WS08SP4 NTDDI_WIN6SP4 #define NTDDI_WIN7 0x06010000 #define NTDDI_WIN8 0x06020000 +#define NTDDI_WINBLUE 0x06030000 +#define NTDDI_WINTHRESHOLD 0x0A000000 +#define NTDDI_WIN10 0x0A000000 /* Version Fields in NTDDI_VERSION */ #define OSVERSION_MASK 0xFFFF0000UL @@ -147,12 +161,18 @@ #elif (_WIN32_WINNT <= _WIN32_WINNT_WINXP) #define _WIN32_IE _WIN32_IE_IE60 #elif (_WIN32_WINNT <= _WIN32_WINNT_WS03) -#define _WIN32_IE 0x0602 +#define _WIN32_IE _WIN32_IE_WS03 +#elif (_WIN32_WINNT <= _WIN32_WINNT_VISTA) +#define _WIN32_IE _WIN32_IE_IE70 +#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN7) +#define _WIN32_IE _WIN32_IE_IE80 +#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN8) +#define _WIN32_IE _WIN32_IE_IE100 #else -#define _WIN32_IE 0x0700 +#define _WIN32_IE _WIN32_IE_IE110 #endif #else -#define _WIN32_IE 0x0700 +#define _WIN32_IE _WIN32_IE_IE110 #endif #endif

9 years, 7 months

[tkreuzer] 67467: [FREELDR] Hey Arch, hyperspace is not the page table range! Rename HYPER_SPACE_ENTRY to SELFMAP_ENTRY.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:25:43 2015 New Revision: 67467 URL: http://svn.reactos.org/svn/reactos?rev=67467&view=rev Log: [FREELDR] Hey Arch, hyperspace is not the page table range! Rename HYPER_SPACE_ENTRY to SELFMAP_ENTRY. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Tue Apr 28 21:25:43 2015 @@ -14,8 +14,6 @@ #include <debug.h> //extern ULONG LoaderPagesSpanned; - -#define HYPER_SPACE_ENTRY 0x1EE DBG_DEFAULT_CHANNEL(WINDOWS); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] Tue Apr 28 21:25:43 2015 @@ -17,7 +17,7 @@ #undef KIP0PCRADDRESS #define KIP0PCRADDRESS 0xffdff000 -#define HYPER_SPACE_ENTRY 0x300 +#define SELFMAP_ENTRY 0x300 // This is needed only for SetProcessorContext routine #pragma pack(2) @@ -93,9 +93,9 @@ PDE = (PHARDWARE_PTE)Buffer; // Map the page directory at 0xC0000000 (maps itself) - PDE[HYPER_SPACE_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; - PDE[HYPER_SPACE_ENTRY].Valid = 1; - PDE[HYPER_SPACE_ENTRY].Write = 1; + PDE[SELFMAP_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; + PDE[SELFMAP_ENTRY].Valid = 1; + PDE[SELFMAP_ENTRY].Write = 1; // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) HalPageTable = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; @@ -204,8 +204,8 @@ PHARDWARE_PTE KernelPT; PFN_NUMBER Entry = (Page >> 10) + (KSEG0_BASE >> 22); - /* Don't unmap hyperspace or HAL entries */ - if (Entry == HYPER_SPACE_ENTRY || Entry == 1023) + /* Don't unmap page directory or HAL entries */ + if (Entry == SELFMAP_ENTRY || Entry == 1023) return; if (PDE[Entry].Valid)

9 years, 7 months

[tkreuzer] 67466: [NTOSKRNL] Fix MSVC warnings.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 28 21:25:21 2015 New Revision: 67466 URL: http://svn.reactos.org/svn/reactos?rev=67466&view=rev Log: [NTOSKRNL] Fix MSVC warnings. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -87,7 +87,7 @@ 0, REG_LINK, TargetKeyName, - wcslen(TargetKeyName) * sizeof(WCHAR)); + (ULONG)wcslen(TargetKeyName) * sizeof(WCHAR)); /* Close the link key handle */ ObCloseHandle(TargetKeyHandle, KernelMode); Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -203,7 +203,7 @@ Length = DataBuffer->MountPointReparseBuffer.SubstituteNameLength; /* Check we don't overflow */ - if ((MAXUSHORT - DataBuffer->Reserved) <= (Length + sizeof(UNICODE_NULL))) + if (((ULONG)MAXUSHORT - DataBuffer->Reserved) <= (Length + sizeof(UNICODE_NULL))) { Irp->IoStatus.Status = STATUS_IO_REPARSE_DATA_INVALID; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -219,7 +219,7 @@ PDEVICE_OBJECT DeviceObject = NULL; GUID FilterGuid; PZZWSTR SymbolicLinkList = NULL, LinkList; - ULONG TotalLength; + SIZE_T TotalLength; _SEH2_TRY { Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -762,7 +762,7 @@ PORT_MESSAGE CapturedMessage; PLPCP_PORT_OBJECT Port = NULL; PETHREAD ClientThread = NULL; - ULONG LocalReturnlength; + SIZE_T LocalReturnlength; PLPCP_MESSAGE InfoMessage; PLPCP_DATA_INFO DataInfo; PVOID DataInfoBaseAddress; Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -972,7 +972,15 @@ /* Loop each PDE while holding the working set lock */ // MiLockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); -#ifndef _M_AMD64 +#ifdef _M_AMD64 +_WARN("MiSessionCommitPageTables halfplemented for amd64") + DBG_UNREFERENCED_LOCAL_VARIABLE(OldIrql); + DBG_UNREFERENCED_LOCAL_VARIABLE(Color); + DBG_UNREFERENCED_LOCAL_VARIABLE(TempPte); + DBG_UNREFERENCED_LOCAL_VARIABLE(Pfn1); + DBG_UNREFERENCED_LOCAL_VARIABLE(PageFrameNumber); + ASSERT(FALSE); +#else while (StartPde <= EndPde) { /* Check if we already have a page table */ @@ -2170,6 +2178,7 @@ ASSERT(SystemMapPde->u.Hard.Valid == 1); MI_WRITE_VALID_PDE(PointerPde, *SystemMapPde); #else + DBG_UNREFERENCED_LOCAL_VARIABLE(SystemMapPde); ASSERT(FALSE); #endif }

9 years, 7 months

[cwittich] 67465: spelling fixes no code changes

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Apr 28 19:22:43 2015 New Revision: 67465 URL: http://svn.reactos.org/svn/reactos?rev=67465&view=rev Log: spelling fixes no code changes Modified: trunk/reactos/lib/drivers/libusb/common_interfaces.h trunk/reactos/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/common_interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/common_… ============================================================================== --- trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] Tue Apr 28 19:22:43 2015 @@ -25,7 +25,7 @@ //--------------------------------------------------------------------------- // -// Object Hierachy +// Object Hierarchy // -------------------------------------------------------------------- // | IRootHCDController | // | IHCDController Intel USB Universal Host Controller - 3A37 | @@ -673,7 +673,7 @@ // // AbortPipe // -// Description: aborts all pending requsts +// Description: aborts all pending requests virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0; @@ -681,7 +681,7 @@ // // GetMaxPacketSize // -// Description: aborts all pending requsts +// Description: aborts all pending requests virtual UCHAR GetMaxPacketSize() = 0; }; Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Tue Apr 28 19:22:43 2015 @@ -327,7 +327,7 @@ // - // If theres a flag in PortChange return TRUE so the SCE Irp will be completed + // If there's a flag in PortChange return TRUE so the SCE Irp will be completed // if (PortChange != 0) {

9 years, 7 months

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 April 2015