Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[dquintana] 62415: [NTUSER] [USER32] * Fix what I think is a wrong behaviour of storing MF_POPUP in the fType of the menu. Now it relies on hSubMenu being != NULL as an indicator of the presence of...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Mar 3 16:12:39 2014 New Revision: 62415 URL: http://svn.reactos.org/svn/reactos?rev=62415&view=rev Log: [NTUSER] [USER32] * Fix what I think is a wrong behaviour of storing MF_POPUP in the fType of the menu. Now it relies on hSubMenu being != NULL as an indicator of the presence of a submenu. * Resource submenus are not supposed to get the hSubMenu as a wID, as far as I can tell. * From the user point of view, it matches Windows better. Needs review and testing, as I don't know if I updated everything correctly. Modified: branches/shell-experiments/win32ss/user/ntuser/menu.c branches/shell-experiments/win32ss/user/user32/windows/menu.c Modified: branches/shell-experiments/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/menu.c [iso-8859-1] Mon Mar 3 16:12:39 2014 @@ -529,7 +529,7 @@ } else { - if(CurItem->fType & MF_POPUP) + if(CurItem->hSubMenu) { PMENU_OBJECT NewMenu = UserGetMenuObject(CurItem->hSubMenu); if(NewMenu) @@ -653,8 +653,7 @@ BOOL FASTCALL IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) { - PMENU_OBJECT SubMenuObject; - UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); + UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR); if(!MenuItem || !MenuObject || !lpmii) { @@ -735,24 +734,6 @@ if(lpmii->fMask & MIIM_SUBMENU) { MenuItem->hSubMenu = lpmii->hSubMenu; - /* Make sure the submenu is marked as a popup menu */ - if (MenuItem->hSubMenu) - { - SubMenuObject = UserGetMenuObject(MenuItem->hSubMenu); - if (SubMenuObject != NULL) - { - SubMenuObject->MenuInfo.Flags |= MF_POPUP; - MenuItem->fType |= MF_POPUP; - } - else - { - MenuItem->fType &= ~MF_POPUP; - } - } - else - { - MenuItem->fType &= ~MF_POPUP; - } } if ((lpmii->fMask & MIIM_STRING) || @@ -1469,7 +1450,7 @@ return NO_SELECTED_ITEM; } - if (!(mi->fType & MF_POPUP)) continue; + if (!(mi->hSubMenu)) continue; if (mi->hSubMenu == hSubTarget) { @@ -2038,7 +2019,7 @@ if (!(ReferenceWnd = UserGetWindowObject(hWnd))) RETURN( FALSE); - if(MenuItem->fType & MF_POPUP) + if(MenuItem->hSubMenu) { XMove = ReferenceWnd->rcClient.left; YMove = ReferenceWnd->rcClient.top; Modified: branches/shell-experiments/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/user32/windows/menu.c [iso-8859-1] Mon Mar 3 16:12:39 2014 @@ -396,7 +396,7 @@ MenuCleanupRosMenuItemInfo(&item); return NO_SELECTED_ITEM; } - if (!(item.fType & MF_POPUP)) continue; + if (!(item.hSubMenu)) continue; if (item.hSubMenu == hSubTarget) { MenuCleanupRosMenuItemInfo(&item); return i; @@ -1207,7 +1207,7 @@ dis.rcItem.bottom); SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis); /* Draw the popup-menu arrow */ - if (lpitem->fType & MF_POPUP) + if (lpitem->hSubMenu) { RECT rectTemp; CopyRect(&rectTemp, &rect); @@ -1345,7 +1345,7 @@ } } /* Draw the popup-menu arrow */ - if (lpitem->fType & MF_POPUP) + if (lpitem->hSubMenu) { RECT rectTemp; CopyRect(&rectTemp, &rect); @@ -1694,7 +1694,7 @@ if (sendMenuSelect) { SendMessageW(hwndOwner, WM_MENUSELECT, - MAKELONG(ItemInfo.fType & MF_POPUP ? wIndex : ItemInfo.wID, + MAKELONG(ItemInfo.hSubMenu ? wIndex : ItemInfo.wID, ItemInfo.fType | ItemInfo.fState | MF_MOUSESELECT | (hmenu->Flags & MF_SYSMENU)), (LPARAM) hmenu->Self); } @@ -2114,8 +2114,7 @@ return NULL; } mii.fMask |= MIIM_SUBMENU; - mii.fType |= MF_POPUP; - mii.wID = (UINT)mii.hSubMenu; + /*mii.wID = (UINT)mii.hSubMenu;*/ } else if (!mii.dwTypeData[0]) mii.fType |= MF_SEPARATOR; @@ -2315,7 +2314,7 @@ MenuCleanupRosMenuItemInfo(&ItemInfo); return MenuInfo->Self; } - if (0 == (ItemInfo.fType & MF_POPUP) || 0 != (ItemInfo.fState & (MF_GRAYED | MF_DISABLED))) + if (0 == (ItemInfo.hSubMenu) || 0 != (ItemInfo.fState & (MF_GRAYED | MF_DISABLED))) { MenuCleanupRosMenuItemInfo(&ItemInfo); return MenuInfo->Self; @@ -2447,7 +2446,7 @@ MenuInitRosMenuItemInfo(&ItemInfo); ItemInfo.fMask |= MIIM_FTYPE | MIIM_STATE; if (! MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo) - || 0 == (ItemInfo.fType & MF_POPUP) + || 0 == (ItemInfo.hSubMenu) || 0 == (ItemInfo.fState & MF_MOUSESELECT)) { MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -2532,7 +2531,7 @@ TRACE("%p %08x %p\n", MenuInfo, ItemInfo.wID, ItemInfo.hSubMenu); - if (0 == (ItemInfo.fType & MF_POPUP)) + if (0 == (ItemInfo.hSubMenu)) { if (0 == (ItemInfo.fState & (MF_GRAYED | MF_DISABLED)) && 0 == (ItemInfo.fType & MF_SEPARATOR)) @@ -2663,7 +2662,7 @@ if (0 <= Id && MenuGetRosMenuItemInfo(MenuInfo.Self, Id, &ItemInfo) && MenuInfo.FocusedItem == Id) { - if (0 == (ItemInfo.fType & MF_POPUP)) + if (0 == (ItemInfo.hSubMenu)) { INT ExecutedMenuId = MenuExecFocusedItem(Mt, &MenuInfo, Flags); MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -2712,7 +2711,7 @@ { MenuInitRosMenuItemInfo(&ItemInfo); if (MenuGetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo) && - 0 != (ItemInfo.fType & MF_POPUP) && + 0 != (ItemInfo.hSubMenu) && 0 != (ItemInfo.fState & MF_MOUSESELECT)) { Ret = MenuPtMenu(ItemInfo.hSubMenu, Pt); @@ -2826,7 +2825,7 @@ MenuCleanupRosMenuItemInfo(&ItemInfo); return NULL; } - if (0 != (ItemInfo.fType & MF_POPUP) && 0 != (ItemInfo.fState & MF_MOUSESELECT)) + if (0 != (ItemInfo.hSubMenu) && 0 != (ItemInfo.fState & MF_MOUSESELECT)) { MenuCleanupRosMenuItemInfo(&ItemInfo); return ItemInfo.hSubMenu; @@ -3885,7 +3884,6 @@ if(Flags & MF_POPUP) { - mii->fType |= MF_POPUP; mii->fMask |= MIIM_SUBMENU; mii->hSubMenu = (HMENU)IDNewItem; } @@ -3995,7 +3993,7 @@ if (0 != (Items[i].fType & MF_MENUBARBREAK)) continue; if (0 != (Items[i].fType & MF_SEPARATOR)) continue; - if ((Items[i].fType & MF_POPUP) && (uFlags == MF_BYCOMMAND)) + if ((Items[i].hSubMenu) && (uFlags == MF_BYCOMMAND)) { MenuCheckMenuRadioItem(Items[i].hSubMenu, idFirst, idLast, idCheck, uFlags, bCheck, pChecked, pUnchecked, pMenuChanged); continue; @@ -4899,7 +4897,7 @@ if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE; - if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) + if ((rmii.hSubMenu) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */ MenuCleanupRosMenuItemInfo( &rmii ); @@ -4946,7 +4944,7 @@ if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE; - if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) + if ((rmii.hSubMenu) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */ MenuCleanupRosMenuItemInfo( &rmii );

10 years, 6 months

[dquintana] 62414: [RSHELL] * Improve logging in case of unexpected failures, and trace the creation of toolbar (menu) items. CORE-7586

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Mar 3 16:11:47 2014 New Revision: 62414 URL: http://svn.reactos.org/svn/reactos?rev=62414&view=rev Log: [RSHELL] * Improve logging in case of unexpected failures, and trace the creation of toolbar (menu) items. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/base/shell/rshell/wraplog.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -40,7 +40,7 @@ HRESULT hr = site->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) site->Release(); return hr; @@ -126,7 +126,7 @@ m_menuOwner; HRESULT hr = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (m_site) @@ -134,11 +134,11 @@ HWND hwndParent; hr = m_site->GetWindow(&hwndParent); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_staticToolbar->FillToolbar(); @@ -170,11 +170,11 @@ hwndParent = NULL; hr = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_site->GetWindow(&hwndParent); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (!::IsWindow(hwndParent)) @@ -183,32 +183,32 @@ if (m_staticToolbar != NULL) { hr = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_staticToolbar->FillToolbar(); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } if (m_SFToolbar != NULL) { hr = m_SFToolbar->CreateToolbar(hwndParent, m_dwFlags); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_SFToolbar->FillToolbar(); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; CComPtr<IOleWindow> pTopLevelWindow; hr = IUnknown_QueryService(m_site, SID_STopLevelBrowser, IID_PPV_ARG(IOleWindow, &pTopLevelWindow)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return pTopLevelWindow->GetWindow(&m_topLevelWindow); @@ -242,12 +242,12 @@ if (m_staticToolbar != NULL) hr = m_staticToolbar->GetIdealSize(sizeStatic); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (m_SFToolbar != NULL) hr = m_SFToolbar->GetIdealSize(sizeShlFld); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (m_staticToolbar == NULL && m_SFToolbar == NULL) @@ -289,12 +289,12 @@ if (m_staticToolbar != NULL) hr = m_staticToolbar->GetIdealSize(sizeStatic); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (m_SFToolbar != NULL) hr = m_SFToolbar->GetIdealSize(sizeShlFld); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (m_staticToolbar == NULL && m_SFToolbar == NULL) @@ -312,17 +312,17 @@ if (m_staticToolbar != NULL) hr = m_staticToolbar->ShowWindow(fShow); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (m_SFToolbar != NULL) hr = m_SFToolbar->ShowWindow(fShow); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (fShow) { hr = _CallCB(SMC_INITMENU, 0, 0); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } @@ -363,18 +363,18 @@ HRESULT hr; hr = m_subMenuParent->SetSubMenu(this, fActivate); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (fActivate) { CComPtr<IOleWindow> pTopLevelWindow; hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &pTopLevelWindow)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = pTopLevelWindow->GetWindow(&m_topLevelWindow); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } else @@ -497,7 +497,7 @@ } HRESULT hr = m_SFToolbar->SetShellFolder(psf, pidlFolder, hKey, dwFlags); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (m_site) @@ -505,11 +505,11 @@ HWND hwndParent; hr = m_site->GetWindow(&hwndParent); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_SFToolbar->CreateToolbar(hwndParent, m_dwFlags); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_SFToolbar->FillToolbar(); @@ -719,7 +719,7 @@ if (m_subMenuChild) { HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(toolbar, item); Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -39,7 +39,7 @@ HRESULT hr = deskbar->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) deskbar->Release(); return hr; @@ -79,7 +79,7 @@ CComPtr<IInputObjectSite> ios; HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return ios->OnFocusChangeIS(punkObj, fSetFocus); @@ -150,7 +150,7 @@ CComPtr<IInputObject> io; HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return io->HasFocusIO(); @@ -161,7 +161,7 @@ CComPtr<IInputObject> io; HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return io->TranslateAcceleratorIO(lpMsg); @@ -183,15 +183,15 @@ } hr = punkClient->QueryInterface(IID_PPV_ARG(IUnknown, &m_Client)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &pDeskBandClient)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = pDeskBandClient->SetDeskBarSite(static_cast<IDeskBar*>(this)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return IUnknown_GetWindow(m_Client, &m_ClientWindow); @@ -250,11 +250,11 @@ return E_FAIL; hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; // Windows calls this, but it appears to be unimplemented? @@ -263,12 +263,12 @@ // No clue about the arg, using anything != 0 hr = dbc->UIActivateDBC(TRUE); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; RECT rc = { 0 }; hr = dbc->GetSize(0, &rc); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; // Unknown meaning @@ -276,7 +276,7 @@ const int CMD_EXEC_OPT = 0; hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; ::AdjustWindowRect(&rc, ::GetWindowLong(m_hWnd, GWL_STYLE), FALSE); @@ -372,7 +372,7 @@ const int CMD_EXEC_OPT = iIcon ? 0 : 2; // seems to work hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; BOOL bHandled; @@ -479,16 +479,16 @@ if (m_SubMenuChild) { hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = dbc->UIActivateDBC(FALSE); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); @@ -506,7 +506,7 @@ CComPtr<IOleWindow> window; hr = popup->QueryInterface(IID_PPV_ARG(IOleWindow, &window)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return FALSE; HWND parent; @@ -517,7 +517,7 @@ popup = NULL; hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return FALSE; } @@ -552,14 +552,14 @@ CComPtr<IWinEventHandler> winEventHandler; HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return 0; if (winEventHandler) { LRESULT result; hr = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return 0; return result; } @@ -615,13 +615,13 @@ // HACK! I just want it to work !!! CComPtr<IDeskBar> db; HRESULT hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return 0; CComPtr<IUnknown> punk; hr = db->GetClient(&punk); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return 0; if (!punk && m_Shown) Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -207,13 +207,13 @@ } hr = newBand->_GetTopLevelWindow(&newFocus); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (!m_currentBand) { hr = PlaceHooks(newFocus); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } @@ -228,7 +228,7 @@ HRESULT hr; hr = PushToArray(mb); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return UpdateFocus(mb); @@ -240,7 +240,7 @@ HRESULT hr; hr = PopFromArray(&mbc); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (mb != mbc) Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -37,7 +37,7 @@ HRESULT hr = site->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) site->Release(); return hr; @@ -109,7 +109,7 @@ if (m_BandObject) { hr = IUnknown_SetSite(m_BandObject, NULL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; } @@ -122,19 +122,19 @@ return TO_HRESULT(0); hr = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = IUnknown_SetSite(punk, this->ToIUnknown()); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = IUnknown_GetWindow(punk, &m_hWndBand); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; m_BandObject = punk; Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -457,11 +457,11 @@ #else hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); #endif - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #if WRAP_MENUSITE hr = CMenuSite_Wrapper(pBandSite, IID_PPV_ARG(IBandSite, &pBandSite)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif @@ -473,25 +473,25 @@ #else hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); #endif - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #if WRAP_MENUDESKBAR hr = CMenuDeskBar_Wrapper(pDeskBar, IID_PPV_ARG(IDeskBar, &pDeskBar)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif hr = pDeskBar->SetClient(pBandSite); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = pBandSite->AddBand(childShellMenu); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; CComPtr<IMenuPopup> popup; hr = pDeskBar->QueryInterface(IID_PPV_ARG(IMenuPopup, &popup)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl, this, m_popupItem); @@ -526,7 +526,7 @@ return E_FAIL; hr = contextMenu->QueryContextMenu(hPopup, 0, 0, UINT_MAX, CMF_NORMAL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { DestroyMenu(hPopup); return hr; @@ -667,7 +667,10 @@ tbb.iBitmap = iconId; tbb.dwData = buttonData; - SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + DbgPrint("Trying to add a new button with id %d and caption '%S'...\n", commandId, caption); + + if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb))) + return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } @@ -684,7 +687,10 @@ tbb.fsStyle = BTNS_SEP; tbb.iBitmap = 0; - SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + DbgPrint("Trying to add a new separator...\n"); + + if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb))) + return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } @@ -699,7 +705,10 @@ tbb.iString = (INT_PTR) MenuString; tbb.iBitmap = -1; - SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + DbgPrint("Trying to add a new placeholder...\n"); + + if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb))) + return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } @@ -790,12 +799,23 @@ info.cbSize = sizeof(info); info.dwTypeData = NULL; - info.fMask = MIIM_FTYPE | MIIM_STRING; - - GetMenuItemInfoW(m_hmenu, i, TRUE, &info); - - if (info.fType == MFT_STRING) - { + info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID; + + if (!GetMenuItemInfoW(m_hmenu, i, TRUE, &info)) + { + DbgPrint("Error obtaining info for menu item at pos=%d\n", i); + continue; + } + + DbgPrint("Found item with fType=%x, cmdId=%d\n", info.fType, info.wID); + + if (info.fType & MFT_SEPARATOR) + { + AddSeparator(last); + } + else // if (info.fType == MFT_STRING) + { + info.cch++; info.dwTypeData = (PWSTR) HeapAlloc(GetProcessHeap(), 0, (info.cch + 1) * sizeof(WCHAR)); @@ -807,16 +827,12 @@ // FIXME: remove before deleting the toolbar or it will leak HRESULT hr = m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; AddButton(info.wID, info.dwTypeData, info.hSubMenu != NULL, sminfo->iIcon, reinterpret_cast<DWORD_PTR>(sminfo), last); HeapFree(GetProcessHeap(), 0, info.dwTypeData); - } - else - { - AddSeparator(last); } } @@ -837,7 +853,7 @@ { HRESULT hr; hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; // in case the clicked item has a submenu, we do not need to execute the item @@ -861,7 +877,7 @@ { CComPtr<IShellMenu> shellMenu; HRESULT hr = m_menuBand->_CallCBWithItemId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return PopupSubMenu(uItem, index, shellMenu); @@ -903,7 +919,7 @@ STRRET sr = { STRRET_CSTR, { 0 } }; hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; StrRetToStr(&sr, NULL, &MenuString); @@ -950,7 +966,7 @@ HRESULT hr; hr = m_shellFolder->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (pdwFlags) @@ -993,7 +1009,7 @@ { HRESULT hr; hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; // in case the clicked item has a submenu, we do not need to execute the item @@ -1028,11 +1044,11 @@ #else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &shellMenu)); #endif - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #if WRAP_MENUBAND hr = CMenuBand_Wrapper(shellMenu, IID_PPV_ARG(IShellMenu, &shellMenu)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif @@ -1040,16 +1056,16 @@ // FIXME: not sure what to use as uId/uIdAncestor here hr = shellMenu->Initialize(psmc, 0, uId, SMINIT_VERTICAL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; CComPtr<IShellFolder> childFolder; hr = m_shellFolder->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &childFolder)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->SetShellFolder(childFolder, NULL, NULL, 0); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return PopupSubMenu(uItem, index, shellMenu); @@ -1062,7 +1078,7 @@ SFGAOF attrs = SFGAO_FOLDER; hr = m_shellFolder->GetAttributesOf(1, &pidl, &attrs); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return (attrs & SFGAO_FOLDER) ? S_OK : S_FALSE; Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -49,10 +49,10 @@ { HRESULT hr; hr = userLocal->EnumObjects(hwndOwner, flags, &m_UserLocal); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = userLocal->EnumObjects(hwndOwner, flags, &m_AllUSers); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { m_UserLocal = NULL; return hr; @@ -73,7 +73,7 @@ if (!m_FirstDone) { hr = m_UserLocal->Next(celt, rgelt, pceltFetched); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (hr == S_FALSE) m_FirstDone = true; @@ -89,7 +89,7 @@ *pceltFetched = 0; hr = m_AllUSers->Next(celt, rgelt, pceltFetched); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; *pceltFetched += offset; @@ -138,7 +138,7 @@ hr = fld->_SetSources(userLocal, allUsers); hr = fld->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) fld->Release(); return hr; Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -156,11 +156,11 @@ #else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); #endif - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #if WRAP_MENUBAND hr = CMenuBand_Wrapper(pShellMenu, IID_PPV_ARG(IShellMenu, &pShellMenu)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif @@ -304,11 +304,11 @@ #else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); #endif - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #if WRAP_MENUBAND hr = CMenuBand_Wrapper(pShellMenu, IID_PPV_ARG(IShellMenu, &pShellMenu)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif @@ -320,11 +320,11 @@ #else hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); #endif - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #if WRAP_MENUSITE hr = CMenuSite_Wrapper(pBandSite, IID_PPV_ARG(IBandSite, &pBandSite)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif @@ -336,23 +336,23 @@ #else hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); #endif - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #if WRAP_MENUDESKBAR hr = CMenuDeskBar_Wrapper(pDeskBar, IID_PPV_ARG(IDeskBar, &pDeskBar)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif CComObject<CShellMenuCallback> *pCallback; hr = CComObject<CShellMenuCallback>::CreateInstance(&pCallback); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; pCallback->AddRef(); // CreateInstance returns object with 0 ref count */ pCallback->Initialize(pShellMenu, pBandSite, pDeskBar); pShellMenu->Initialize(pCallback, (UINT)-1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = SHGetDesktopFolder(&shellFolder); @@ -369,24 +369,24 @@ IShellFolder * psfMerged; hr = CMergedFolder_Constructor(psfStartMenuUser, psfStartMenuAll, IID_PPV_ARG(IShellFolder, &psfMerged)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = pShellMenu->SetShellFolder(psfMerged, NULL, NULL, 0); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #else hr = pShellMenu->SetShellFolder(psfStartMenuUser, NULL, NULL, 0); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; #endif hr = pDeskBar->SetClient(pBandSite); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = pBandSite->AddBand(pShellMenu); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return pDeskBar->QueryInterface(riid, ppv); Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -182,7 +182,7 @@ return E_OUTOFMEMORY; hr = site->InitWrap(shellMenu); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { site->Release(); return hr; @@ -190,7 +190,7 @@ hr = site->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) site->Release(); return hr; @@ -205,33 +205,33 @@ m_IShellMenu = shellMenu; hr = shellMenu->QueryInterface(IID_PPV_ARG(IDeskBand, &m_IDeskBand)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IDockingWindow, &m_IDockingWindow)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IPersistStream, &m_IPersistStream)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IPersist, &m_IPersist)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_IMenuPopup)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IDeskBar, &m_IDeskBar)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IMenuBand, &m_IMenuBand)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IShellMenu2, &m_IShellMenu2)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = shellMenu->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_IWinEventHandler)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; //hr = shellMenu->QueryInterface(IID_PPV_ARG(IShellMenuAcc, &m_IShellMenuAcc)); m_IShellMenuAcc = NULL; return hr; Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -121,7 +121,7 @@ return E_OUTOFMEMORY; hr = bar->InitWrap(deskBar); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { bar->Release(); return hr; @@ -129,7 +129,7 @@ hr = bar->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) bar->Release(); return hr; @@ -144,21 +144,21 @@ m_IDeskBar = deskBar; hr = deskBar->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_IMenuPopup)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IInputObjectSite, &m_IInputObjectSite)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IBanneredBar, &m_IBanneredBar)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = deskBar->QueryInterface(IID_PPV_ARG(IInitializeObject, &m_IInitializeObject)); return hr; } Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -116,7 +116,7 @@ return E_OUTOFMEMORY; hr = site->InitWrap(bandSite); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { site->Release(); return hr; @@ -124,7 +124,7 @@ hr = site->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) site->Release(); return hr; @@ -139,17 +139,17 @@ m_IBandSite = bandSite; hr = bandSite->QueryInterface(IID_PPV_ARG(IDeskBarClient, &m_IDeskBarClient)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IInputObjectSite, &m_IInputObjectSite)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_IWinEventHandler)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider)); return hr; } Modified: branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -82,7 +82,7 @@ return E_OUTOFMEMORY; hr = site->InitWrap(trayPriv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { site->Release(); return hr; @@ -90,7 +90,7 @@ hr = site->QueryInterface(riid, ppv); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) site->Release(); return hr; @@ -105,9 +105,9 @@ m_ITrayPriv = bandSite; hr = bandSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow)); - if (FAILED(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = bandSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget)); return hr; } Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -87,3 +87,9 @@ #define DbgPrint(fmt, ...) \ Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__) + +#if 1 +#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr) && (DbgPrint("Unexpected failure %08x.\n", hr), TRUE)) +#else +#define FAILED_UNEXPECTEDLY(hr) FAILED(hr) +#endif Modified: branches/shell-experiments/base/shell/rshell/wraplog.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/wraplog.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/wraplog.cpp [iso-8859-1] Mon Mar 3 16:11:47 2014 @@ -13,7 +13,7 @@ { if (openCount == 0) { - log = fopen("G:\\RShellWrap.log", "w"); + log = fopen("C:\\RShellWrap.log", "w"); nTemps = 0; callLevel = 0; }

10 years, 6 months

[ekohl] 62413: [ADVAPI32] Implement the ANSI part of ion's half done patch from r59843. Fixes two more service bugs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 3 15:44:44 2014 New Revision: 62413 URL: http://svn.reactos.org/svn/reactos?rev=62413&view=rev Log: [ADVAPI32] Implement the ANSI part of ion's half done patch from r59843. Fixes two more service bugs. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Mon Mar 3 15:44:44 2014 @@ -288,8 +288,10 @@ { LPWSTR *lpVector; LPWSTR *lpArg; - DWORD i, cbServiceName, cbTotal; LPWSTR pszServiceName; + DWORD cbServiceName; + DWORD cbTotal; + DWORD i; if (ControlPacket == NULL || lpArgCount == NULL || lpArgVector == NULL) return ERROR_INVALID_PARAMETER; @@ -297,18 +299,12 @@ *lpArgCount = 0; *lpArgVector = NULL; - pszServiceName = (PWSTR) ((PBYTE) ControlPacket + ControlPacket->dwServiceNameOffset); + pszServiceName = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); cbServiceName = lstrlenW(pszServiceName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + cbTotal = cbServiceName + sizeof(LPWSTR); if (ControlPacket->dwArgumentsCount > 0) - { - cbTotal = ControlPacket->dwSize - ControlPacket->dwArgumentsOffset + - cbServiceName + sizeof(LPWSTR); - } - else - { - cbTotal = cbServiceName + sizeof(LPWSTR); - } + cbTotal += ControlPacket->dwSize - ControlPacket->dwArgumentsOffset; lpVector = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -321,7 +317,7 @@ lpArg++; memcpy(lpArg, pszServiceName, cbServiceName); - lpArg = (LPWSTR*) ((ULONG_PTR) lpArg + cbServiceName); + lpArg = (LPWSTR*)((ULONG_PTR)lpArg + cbServiceName); if (ControlPacket->dwArgumentsCount > 0) { @@ -351,10 +347,13 @@ LPSTR *lpVector; LPSTR *lpPtr; LPWSTR lpUnicodeString; + LPWSTR pszServiceName; LPSTR lpAnsiString; + DWORD cbServiceName; DWORD dwVectorSize; DWORD dwUnicodeSize; - DWORD dwAnsiSize; + DWORD dwAnsiSize = 0; + DWORD dwAnsiNameSize = 0; DWORD i; if (ControlPacket == NULL || lpArgCount == NULL || lpArgVector == NULL) @@ -363,13 +362,21 @@ *lpArgCount = 0; *lpArgVector = NULL; - /* FIXME: There should always be one argument (the name) sent to services... */ - /* FIXME: See the Unicode version above on how to achieve this */ - + pszServiceName = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); + cbServiceName = lstrlenW(pszServiceName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + dwAnsiNameSize = WideCharToMultiByte(CP_ACP, + 0, + pszServiceName, + cbServiceName, + NULL, + 0, + NULL, + NULL); + + dwVectorSize = ControlPacket->dwArgumentsCount * sizeof(LPWSTR); if (ControlPacket->dwArgumentsCount > 0) { - dwVectorSize = ControlPacket->dwArgumentsCount * sizeof(LPWSTR); - lpUnicodeString = (LPWSTR)((PBYTE)ControlPacket + ControlPacket->dwArgumentsOffset + dwVectorSize); @@ -385,15 +392,31 @@ 0, NULL, NULL); - - lpVector = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwVectorSize + dwAnsiSize); - if (lpVector == NULL) - return ERROR_OUTOFMEMORY; - - lpPtr = (LPSTR*)lpVector; - lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize); + } + + dwVectorSize += sizeof(LPWSTR); + + lpVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwVectorSize + dwAnsiNameSize + dwAnsiSize); + if (lpVector == NULL) + return ERROR_OUTOFMEMORY; + + lpPtr = (LPSTR*)lpVector; + lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize); + + WideCharToMultiByte(CP_ACP, + 0, + pszServiceName, + cbServiceName, + lpAnsiString, + dwAnsiNameSize, + NULL, + NULL); + + if (ControlPacket->dwArgumentsCount > 0) + { + lpAnsiString = (LPSTR)((ULONG_PTR)lpAnsiString + dwAnsiNameSize); WideCharToMultiByte(CP_ACP, 0, @@ -403,18 +426,19 @@ dwAnsiSize, NULL, NULL); - - for (i = 0; i < ControlPacket->dwArgumentsCount; i++) - { - *lpPtr = lpAnsiString; - - lpPtr++; - lpAnsiString += (strlen(lpAnsiString) + 1); - } - - *lpArgCount = ControlPacket->dwArgumentsCount; - *lpArgVector = lpVector; - } + } + + lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize); + for (i = 0; i < ControlPacket->dwArgumentsCount + 1; i++) + { + *lpPtr = lpAnsiString; + + lpPtr++; + lpAnsiString += (strlen(lpAnsiString) + 1); + } + + *lpArgCount = ControlPacket->dwArgumentsCount + 1; + *lpArgVector = lpVector; return ERROR_SUCCESS; }

10 years, 6 months

[dquintana] 62412: [RSHELL] * Move the copying back where it belongs. CMake may generate the dependencies the wrong way around (explorer-new should depend on rshell), but at least the copying works...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Mar 3 11:14:04 2014 New Revision: 62412 URL: http://svn.reactos.org/svn/reactos?rev=62412&view=rev Log: [RSHELL] * Move the copying back where it belongs. CMake may generate the dependencies the wrong way around (explorer-new should depend on rshell), but at least the copying works as expected, even if I always have to "build solution". * Allow toggling between TBSTYLE_EX_VERTICAL and the manual TBSTATE_WRAP setting by (un)definiting TBSTYLE_EX_VERTICAL. CORE-7881 Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Mon Mar 3 11:14:04 2014 @@ -39,9 +39,3 @@ ntdll) add_pch(explorer_new precomp.h SOURCE) add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) - -add_custom_command(TARGET explorer_new POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy - "$<TARGET_FILE:rshell>" - "$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>" - COMMENT "Copying $<TARGET_FILE_NAME:rshell> to output") Modified: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] Mon Mar 3 11:14:04 2014 @@ -11,15 +11,4 @@ shell32 msvcrt kernel32) - -add_custom_command(TARGET filebrowser POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy - "$<TARGET_FILE:rshell>" - "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>" - COMMENT "Copying $<TARGET_FILE_NAME:rshell> to output") - -add_custom_command(TARGET filebrowser POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy - "$<TARGET_FILE:browseui>" - "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>" - COMMENT "Copying $<TARGET_FILE_NAME:browseui> to output") + Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Mon Mar 3 11:14:04 2014 @@ -43,3 +43,9 @@ ntdll) add_cd_file(TARGET rshell DESTINATION reactos FOR all) + +add_custom_command(TARGET rshell POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:rshell>" + "$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>" + COMMENT "Copying to output directory") Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Mon Mar 3 11:14:04 2014 @@ -34,7 +34,8 @@ _Out_ void **ppv ); -#define TBSTYLE_EX_VERTICAL 4 +// FIXME: Enable if/when wine comctl supports this flag properly +//#define TBSTYLE_EX_VERTICAL 4 #define TIMERID_HOTTRACK 1 #define SUBCLASS_ID_MENUBAND 1 @@ -259,8 +260,10 @@ { tbStyles |= CCS_VERT; +#ifdef TBSTYLE_EX_VERTICAL // FIXME: Use when it works in ros (?) - //tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW; + tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW; +#endif } RECT rc; @@ -644,11 +647,15 @@ return S_FALSE; } -HRESULT CMenuToolbarBase::AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData) +HRESULT CMenuToolbarBase::AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData, BOOL last) { TBBUTTON tbb = { 0 }; - tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; + tbb.fsState = TBSTATE_ENABLED; +#ifndef TBSTYLE_EX_VERTICAL + if (!last) + tbb.fsState |= TBSTATE_WRAP; +#endif tbb.fsStyle = 0; if (hasSubMenu) @@ -665,11 +672,15 @@ return S_OK; } -HRESULT CMenuToolbarBase::AddSeparator() +HRESULT CMenuToolbarBase::AddSeparator(BOOL last) { TBBUTTON tbb = { 0 }; - tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; + tbb.fsState = TBSTATE_ENABLED; +#ifndef TBSTYLE_EX_VERTICAL + if (!last) + tbb.fsState |= TBSTATE_WRAP; +#endif tbb.fsStyle = BTNS_SEP; tbb.iBitmap = 0; @@ -683,7 +694,7 @@ TBBUTTON tbb = { 0 }; PCWSTR MenuString = L"(Empty)"; - tbb.fsState = TBSTATE_WRAP; // disabled + tbb.fsState = 0; tbb.fsStyle = 0; tbb.iString = (INT_PTR) MenuString; tbb.iBitmap = -1; @@ -773,11 +784,13 @@ for (i = 0; i < ic; i++) { + BOOL last = i + 1 == ic; + MENUITEMINFOW info; info.cbSize = sizeof(info); info.dwTypeData = NULL; - info.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_SUBMENU; + info.fMask = MIIM_FTYPE | MIIM_STRING; GetMenuItemInfoW(m_hmenu, i, TRUE, &info); @@ -786,7 +799,7 @@ info.cch++; info.dwTypeData = (PWSTR) HeapAlloc(GetProcessHeap(), 0, (info.cch + 1) * sizeof(WCHAR)); - info.fMask = MIIM_STRING; + info.fMask = MIIM_STRING | MIIM_SUBMENU | MIIM_ID; GetMenuItemInfoW(m_hmenu, i, TRUE, &info); SMINFO * sminfo = new SMINFO(); @@ -797,13 +810,13 @@ if (FAILED(hr)) return hr; - AddButton(info.wID, info.dwTypeData, info.hSubMenu != NULL, sminfo->iIcon, reinterpret_cast<DWORD_PTR>(sminfo)); + AddButton(info.wID, info.dwTypeData, info.hSubMenu != NULL, sminfo->iIcon, reinterpret_cast<DWORD_PTR>(sminfo), last); HeapFree(GetProcessHeap(), 0, info.dwTypeData); } else { - AddSeparator(); + AddSeparator(last); } } @@ -881,7 +894,8 @@ LPITEMIDLIST item = static_cast<LPITEMIDLIST>(CoTaskMemAlloc(sizeof(ITEMIDLIST))); ULONG fetched; - while ((hr = eidl->Next(1, &item, &fetched)) == S_OK) + hr = eidl->Next(1, &item, &fetched); + while (SUCCEEDED(hr) && fetched > 0) { INT index = 0; INT indexOpen = 0; @@ -904,7 +918,10 @@ DWORD_PTR dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); // FIXME: remove before deleting the toolbar or it will leak - AddButton(++i, MenuString, attrs & SFGAO_FOLDER, index, dwData); + // Fetch next item already, so we know if the current one is the last + hr = eidl->Next(1, &item, &fetched); + + AddButton(++i, MenuString, attrs & SFGAO_FOLDER, index, dwData, SUCCEEDED(hr) && fetched > 0); CoTaskMemFree(MenuString); } Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Mon Mar 3 11:14:04 2014 @@ -87,8 +87,8 @@ LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - HRESULT AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData); - HRESULT AddSeparator(); + HRESULT AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData, BOOL last); + HRESULT AddSeparator(BOOL last); HRESULT AddPlaceholder(); HRESULT UpdateImageLists();

10 years, 6 months

[dquintana] 62411: [RSHELL] * Improve encapsulation of the CMenuToolbarBase by avoiding unnecessary usages of the window handle from the derived classes. CORE-7881

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Mar 3 10:19:35 2014 New Revision: 62411 URL: http://svn.reactos.org/svn/reactos?rev=62411&view=rev Log: [RSHELL] * Improve encapsulation of the CMenuToolbarBase by avoiding unnecessary usages of the window handle from the derived classes. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Mon Mar 3 10:19:35 2014 @@ -36,7 +36,6 @@ #define TBSTYLE_EX_VERTICAL 4 - #define TIMERID_HOTTRACK 1 #define SUBCLASS_ID_MENUBAND 1 @@ -170,10 +169,10 @@ CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : m_hwnd(NULL), m_useFlatMenus(FALSE), + m_SubclassOld(NULL), m_menuBand(menuBand), m_hwndToolbar(NULL), m_dwMenuFlags(0), - m_SubclassOld(NULL), m_hasIdealSize(FALSE), m_usePager(usePager), m_hotItem(-1), @@ -645,130 +644,56 @@ return S_FALSE; } -BOOL -AllocAndGetMenuString(HMENU hMenu, UINT ItemIDByPosition, WCHAR** String) -{ - int Length; - - Length = GetMenuStringW(hMenu, ItemIDByPosition, NULL, 0, MF_BYPOSITION); - - if (!Length) - return FALSE; - - /* Also allocate space for the terminating NULL character */ - ++Length; - *String = (PWSTR) HeapAlloc(GetProcessHeap(), 0, Length * sizeof(WCHAR)); - - GetMenuStringW(hMenu, ItemIDByPosition, *String, Length, MF_BYPOSITION); - - return TRUE; -} - -CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) : - CMenuToolbarBase(menuBand, FALSE), - m_hmenu(NULL) -{ -} - -HRESULT CMenuStaticToolbar::GetMenu( - HMENU *phmenu, - HWND *phwnd, - DWORD *pdwFlags) -{ - *phmenu = m_hmenu; - *phwnd = NULL; - *pdwFlags = m_dwMenuFlags; - - return S_OK; -} - -HRESULT CMenuStaticToolbar::SetMenu( - HMENU hmenu, - HWND hwnd, - DWORD dwFlags) -{ - m_hmenu = hmenu; - m_dwMenuFlags = dwFlags; - - return S_OK; -} - -HRESULT CMenuStaticToolbar::FillToolbar() -{ - int i; - int ic = GetMenuItemCount(m_hmenu); - - for (i = 0; i < ic; i++) - { - MENUITEMINFOW info; - TBBUTTON tbb = { 0 }; - PWSTR MenuString = NULL; - - tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; - tbb.fsStyle = 0; - - info.cbSize = sizeof(info); - info.fMask = MIIM_FTYPE | MIIM_ID; - - GetMenuItemInfoW(m_hmenu, i, TRUE, &info); - - if (info.fType == MFT_STRING) - { - if (!AllocAndGetMenuString(m_hmenu, i, &MenuString)) - return E_OUTOFMEMORY; - if (::GetSubMenu(m_hmenu, i) != NULL) - tbb.fsStyle |= BTNS_DROPDOWN; - tbb.iString = (INT_PTR) MenuString; - tbb.idCommand = info.wID; - - SMINFO * sminfo = new SMINFO(); - sminfo->dwMask = SMIM_ICON | SMIM_FLAGS; - if (SUCCEEDED(m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)))) - { - tbb.iBitmap = sminfo->iIcon; - tbb.dwData = reinterpret_cast<DWORD_PTR>(sminfo); - // FIXME: remove before deleting the toolbar or it will leak - } - } - else - { - tbb.fsStyle |= BTNS_SEP; - } - - SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); - - if (MenuString) - HeapFree(GetProcessHeap(), 0, MenuString); - } - - return S_OK; -} - -HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick) -{ - CComPtr<IContextMenu> contextMenu; - HRESULT hr = m_menuBand->_CallCBWithItemId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); - if (hr != S_OK) - return hr; - - return DoContextMenu(contextMenu); -} - -HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) -{ - HRESULT hr; - hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); - if (FAILED(hr)) - return hr; - - // in case the clicked item has a submenu, we do not need to execute the item - if (hr == S_FALSE) - return hr; - - return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); -} - -HRESULT CMenuStaticToolbar::PopupItem(INT uItem) +HRESULT CMenuToolbarBase::AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData) +{ + TBBUTTON tbb = { 0 }; + + tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; + tbb.fsStyle = 0; + + if (hasSubMenu) + tbb.fsStyle |= BTNS_DROPDOWN; + + tbb.iString = (INT_PTR) caption; + tbb.idCommand = commandId; + + tbb.iBitmap = iconId; + tbb.dwData = buttonData; + + SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + + return S_OK; +} + +HRESULT CMenuToolbarBase::AddSeparator() +{ + TBBUTTON tbb = { 0 }; + + tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; + tbb.fsStyle = BTNS_SEP; + tbb.iBitmap = 0; + + SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + + return S_OK; +} + +HRESULT CMenuToolbarBase::AddPlaceholder() +{ + TBBUTTON tbb = { 0 }; + PCWSTR MenuString = L"(Empty)"; + + tbb.fsState = TBSTATE_WRAP; // disabled + tbb.fsStyle = 0; + tbb.iString = (INT_PTR) MenuString; + tbb.iBitmap = -1; + + SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + + return S_OK; +} + +HRESULT CMenuToolbarBase::GetDataFromId(INT uItem, INT* pIndex, DWORD_PTR* pData) { TBBUTTONINFO info = { 0 }; info.cbSize = sizeof(TBBUTTONINFO); @@ -777,10 +702,141 @@ if (index < 0) return E_FAIL; - TBBUTTON btn = { 0 }; - SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); - - SMINFO * nfo = reinterpret_cast<SMINFO*>(btn.dwData); + if (pIndex) + *pIndex = index; + + if (pData) + { + TBBUTTON btn = { 0 }; + if (!SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn))) + return E_FAIL; + *pData = btn.dwData; + } + + return S_OK; +} + + +HRESULT CMenuToolbarBase::PopupItem(INT uItem) +{ + INT index; + DWORD_PTR dwData; + + GetDataFromId(uItem, &index, &dwData); + + return InternalPopupItem(uItem, index, dwData); +} + +HRESULT CMenuToolbarBase::HasSubMenu(INT uItem) +{ + INT index; + DWORD_PTR dwData; + + GetDataFromId(uItem, &index, &dwData); + + return InternalHasSubMenu(uItem, index, dwData); +} + +CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) : + CMenuToolbarBase(menuBand, FALSE), + m_hmenu(NULL) +{ +} + +HRESULT CMenuStaticToolbar::GetMenu( + HMENU *phmenu, + HWND *phwnd, + DWORD *pdwFlags) +{ + *phmenu = m_hmenu; + *phwnd = NULL; + *pdwFlags = m_dwMenuFlags; + + return S_OK; +} + +HRESULT CMenuStaticToolbar::SetMenu( + HMENU hmenu, + HWND hwnd, + DWORD dwFlags) +{ + m_hmenu = hmenu; + m_dwMenuFlags = dwFlags; + + return S_OK; +} + +HRESULT CMenuStaticToolbar::FillToolbar() +{ + int i; + int ic = GetMenuItemCount(m_hmenu); + + for (i = 0; i < ic; i++) + { + MENUITEMINFOW info; + + info.cbSize = sizeof(info); + info.dwTypeData = NULL; + info.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_SUBMENU; + + GetMenuItemInfoW(m_hmenu, i, TRUE, &info); + + if (info.fType == MFT_STRING) + { + info.cch++; + info.dwTypeData = (PWSTR) HeapAlloc(GetProcessHeap(), 0, (info.cch + 1) * sizeof(WCHAR)); + + info.fMask = MIIM_STRING; + GetMenuItemInfoW(m_hmenu, i, TRUE, &info); + + SMINFO * sminfo = new SMINFO(); + sminfo->dwMask = SMIM_ICON | SMIM_FLAGS; + // FIXME: remove before deleting the toolbar or it will leak + + HRESULT hr = m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)); + if (FAILED(hr)) + return hr; + + AddButton(info.wID, info.dwTypeData, info.hSubMenu != NULL, sminfo->iIcon, reinterpret_cast<DWORD_PTR>(sminfo)); + + HeapFree(GetProcessHeap(), 0, info.dwTypeData); + } + else + { + AddSeparator(); + } + } + + return S_OK; +} + +HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick) +{ + CComPtr<IContextMenu> contextMenu; + HRESULT hr = m_menuBand->_CallCBWithItemId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); + if (hr != S_OK) + return hr; + + return DoContextMenu(contextMenu); +} + +HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + HRESULT hr; + hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + if (FAILED(hr)) + return hr; + + // in case the clicked item has a submenu, we do not need to execute the item + if (hr == S_FALSE) + return hr; + + return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); +} + +HRESULT CMenuStaticToolbar::InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData) +{ + SMINFO * nfo = reinterpret_cast<SMINFO*>(dwData); if (!nfo) return E_FAIL; @@ -799,14 +855,8 @@ } } -HRESULT CMenuStaticToolbar::HasSubMenu(INT uItem) -{ - TBBUTTONINFO info = { 0 }; - info.cbSize = sizeof(TBBUTTONINFO); - info.dwMask = 0; - int index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); - if (index < 0) - return E_FAIL; +HRESULT CMenuStaticToolbar::InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData) +{ return ::GetSubMenu(m_hmenu, index) ? S_OK : S_FALSE; } @@ -836,10 +886,6 @@ INT index = 0; INT indexOpen = 0; - TBBUTTON tbb = { 0 }; - tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; - tbb.fsStyle = 0; - STRRET sr = { STRRET_CSTR, { 0 } }; hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr); @@ -855,37 +901,19 @@ SFGAOF attrs = SFGAO_FOLDER; hr = m_shellFolder->GetAttributesOf(1, &itemc, &attrs); - if (attrs & SFGAO_FOLDER) - { - tbb.fsStyle |= BTNS_DROPDOWN; - } - - tbb.idCommand = ++i; - tbb.iString = (INT_PTR) MenuString; - tbb.iBitmap = index; - tbb.dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); + DWORD_PTR dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); // FIXME: remove before deleting the toolbar or it will leak - SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + AddButton(++i, MenuString, attrs & SFGAO_FOLDER, index, dwData); + CoTaskMemFree(MenuString); - } CoTaskMemFree(item); // If no items were added, show the "empty" placeholder if (i == 0) { - TBBUTTON tbb = { 0 }; - PCWSTR MenuString = L"(Empty)"; - - tbb.fsState = 0/*TBSTATE_DISABLED*/; - tbb.fsStyle = 0; - tbb.iString = (INT_PTR) MenuString; - tbb.iBitmap = -1; - - SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); - - return S_OK; + return AddPlaceholder(); } return hr; @@ -931,25 +959,6 @@ return hr; } -LPITEMIDLIST CMenuSFToolbar::GetPidlFromId(INT uItem, INT* pIndex) -{ - TBBUTTONINFO info = { 0 }; - info.cbSize = sizeof(TBBUTTONINFO); - info.dwMask = 0; - int index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); - if (index < 0) - return NULL; - - if (pIndex) - *pIndex = index; - - TBBUTTON btn = { 0 }; - if (!SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn))) - return NULL; - - return reinterpret_cast<LPITEMIDLIST>(btn.dwData); -} - HRESULT CMenuSFToolbar::OnContextMenu(NMMOUSE * rclick) { HRESULT hr; @@ -974,20 +983,22 @@ if (hr == S_FALSE) return hr; - return m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); -} - -HRESULT CMenuSFToolbar::PopupItem(INT uItem) + DWORD_PTR data; + GetDataFromId(wParam, NULL, &data); + + return m_menuBand->_CallCBWithItemPidl(reinterpret_cast<LPITEMIDLIST>(data), SMC_SFEXEC, 0, 0); +} + +HRESULT CMenuSFToolbar::InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData) { HRESULT hr; UINT uId; UINT uIdAncestor; DWORD flags; - int index; CComPtr<IShellMenuCallback> psmc; CComPtr<IShellMenu> shellMenu; - LPITEMIDLIST pidl = GetPidlFromId(uItem, &index); + LPITEMIDLIST pidl = reinterpret_cast<LPITEMIDLIST>(dwData); if (!pidl) return E_FAIL; @@ -1027,10 +1038,10 @@ return PopupSubMenu(uItem, index, shellMenu); } -HRESULT CMenuSFToolbar::HasSubMenu(INT uItem) +HRESULT CMenuSFToolbar::InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData) { HRESULT hr; - LPCITEMIDLIST pidl = GetPidlFromId(uItem); + LPCITEMIDLIST pidl = reinterpret_cast<LPITEMIDLIST>(dwData); SFGAOF attrs = SFGAO_FOLDER; hr = m_shellFolder->GetAttributesOf(1, &pidl, &attrs); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Mon Mar 3 10:19:35 2014 @@ -28,12 +28,12 @@ HWND m_hwnd; // May be the pager HFONT m_marlett; BOOL m_useFlatMenus; + WNDPROC m_SubclassOld; protected: CMenuBand * m_menuBand; HWND m_hwndToolbar; DWORD m_dwMenuFlags; - WNDPROC m_SubclassOld; BOOL m_hasIdealSize; SIZE m_idealSize; BOOL m_usePager; @@ -73,14 +73,23 @@ void InvalidateDraw(); virtual HRESULT FillToolbar() = 0; - virtual HRESULT PopupItem(INT uItem) = 0; - virtual HRESULT HasSubMenu(INT uItem) = 0; virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; + + HRESULT PopupItem(INT uItem); + HRESULT HasSubMenu(INT uItem); + HRESULT GetDataFromId(INT uItem, INT* pIndex, DWORD_PTR* pData); protected: virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData) = 0; + virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData) = 0; + LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + + HRESULT AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData); + HRESULT AddSeparator(); + HRESULT AddPlaceholder(); HRESULT UpdateImageLists(); }; @@ -99,11 +108,12 @@ HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); virtual HRESULT FillToolbar(); - virtual HRESULT PopupItem(INT uItem); - virtual HRESULT HasSubMenu(INT uItem); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); virtual HRESULT OnContextMenu(NMMOUSE * rclick); +protected: + virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData); + virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData); }; class CMenuSFToolbar : @@ -122,11 +132,10 @@ HRESULT GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); virtual HRESULT FillToolbar(); - virtual HRESULT PopupItem(INT uItem); - virtual HRESULT HasSubMenu(INT uItem); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); virtual HRESULT OnContextMenu(NMMOUSE * rclick); -private: - LPITEMIDLIST GetPidlFromId(INT uItem, INT* pIndex = NULL); +protected: + virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData); + virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData); };

10 years, 6 months

[jimtabor] 62410: [WinSS] - Fix activate modal dialog when clicking on a disabled window (part 2) without zorder support. Other than clicking the tool bar, it will help activate the popup and bring...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Mar 3 06:38:45 2014 New Revision: 62410 URL: http://svn.reactos.org/svn/reactos?rev=62410&view=rev Log: [WinSS] - Fix activate modal dialog when clicking on a disabled window (part 2) without zorder support. Other than clicking the tool bar, it will help activate the popup and bring it to the top. Panic mode support. - Adapt window from point to ignore disabled windows. Attempting to fill a code hole. See CORE-6651. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winpos.h Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Mon Mar 3 06:38:45 2014 @@ -120,7 +120,7 @@ (WPARAM)UserHMGetHandle(Window), 0); } - //// Fixes bug 7089. + //// Fixes CORE-6434. if (!(Window->style & WS_CHILD)) { PWND pwndTemp = co_GetDesktopWindow(Window)->spwndChild; @@ -229,8 +229,6 @@ co_IntMakeWindowActive(Window); - /* FIXME: IntIsWindow */ - co_IntSendMessageNoWait( UserHMGetHandle(Window), WM_NCACTIVATE, (WPARAM)(Window == (gpqForeground ? gpqForeground->spwndActive : NULL)), @@ -552,9 +550,7 @@ co_IntMouseActivateWindow(PWND Wnd) { HWND Top; - PWND TopWindow; USER_REFERENCE_ENTRY Ref; - ASSERT_REFS_CO(Wnd); if (Wnd->style & WS_DISABLED) @@ -564,6 +560,7 @@ PWND DesktopWindow = UserGetDesktopWindow(); if (DesktopWindow) { + ERR("Window Diabled\n"); Top = IntFindChildWindowToOwner(DesktopWindow, Wnd); if ((TopWnd = ValidateHwndNoErr(Top))) { @@ -576,15 +573,8 @@ } return FALSE; } - - TopWindow = UserGetAncestor(Wnd, GA_ROOT); - //if (TopWindow) {ERR("MAW 2 pWnd %p hWnd %p\n",TopWindow,TopWindow->head.h);} - if (!TopWindow) return FALSE; - - /* TMN: Check return value from this function? */ - UserRefObjectCo(TopWindow, &Ref); - co_IntSetForegroundAndFocusWindow(TopWindow, TRUE); - UserDerefObjectCo(TopWindow); + ERR("Mouse Active\n"); + co_IntSetForegroundAndFocusWindow(Wnd, TRUE); return TRUE; } @@ -733,6 +723,7 @@ InAAPM = co_IntSendActivateMessages(WndPrev, Wnd, bMouse, Async); /* now change focus if necessary */ + //// Fixes CORE-6452 allows setting focus on window. if (bFocus && !(ThreadQueue->QF_flags & QF_FOCUSNULLSINCEACTIVE)) { /* Do not change focus if the window is no longer active */ @@ -745,7 +736,7 @@ IntSendFocusMessages( pti, pWndSend); } } - + //// if (InAAPM) { pti->TIF_flags &= ~TIF_INACTIVATEAPPMSG; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Mar 3 06:38:45 2014 @@ -575,6 +575,7 @@ { pti = pwnd->head.pti; MessageQueue = pti->MessageQueue; + // MessageQueue->ptiMouse = pti; if ( pti->TIF_flags & TIF_INCLEANUP || MessageQueue->QF_flags & QF_INDESTROY) { @@ -1342,7 +1343,7 @@ USHORT hittest; EVENTMSG event; MOUSEHOOKSTRUCT hook; - BOOL eatMsg; + BOOL eatMsg = FALSE; PWND pwndMsg, pwndDesktop; PUSER_MESSAGE_QUEUE MessageQueue; @@ -1367,9 +1368,8 @@ if (pwndMsg) UserReferenceObject(pwndMsg); } else - { // Fix wine Msg test_HTTRANSPARENT. Start with a NULL window. - // http://www.winehq.org/pipermail/wine-patches/2012-August/116776.html - pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest); + { + pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest, TRUE); } TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest); @@ -1391,10 +1391,6 @@ } msg->hwnd = UserHMGetHandle(pwndMsg); - -#if 0 - if (!check_hwnd_filter( msg, hwnd_filter )) RETURN(FALSE); -#endif pt = msg->pt; message = msg->message; @@ -1546,8 +1542,6 @@ msg->message = message; RETURN(TRUE); } - - eatMsg = FALSE; if ((msg->message == WM_LBUTTONDOWN) || (msg->message == WM_RBUTTONDOWN) || @@ -1807,8 +1801,7 @@ break; } } - CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, - ListEntry); + CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); } while(CurrentEntry != ListHead); Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon Mar 3 06:38:45 2014 @@ -2440,7 +2440,8 @@ co_WinPosSearchChildren( PWND ScopeWin, POINT *Point, - USHORT *HitTest + USHORT *HitTest, + BOOL Ignore ) { PWND pwndChild; @@ -2451,7 +2452,7 @@ return NULL; } - if ((ScopeWin->style & WS_DISABLED)) + if (!Ignore && (ScopeWin->style & WS_DISABLED)) { return NULL; } @@ -2475,7 +2476,7 @@ continue; } - pwndChild = co_WinPosSearchChildren(pwndChild, Point, HitTest); + pwndChild = co_WinPosSearchChildren(pwndChild, Point, HitTest, Ignore); if(pwndChild != NULL) { @@ -2506,7 +2507,7 @@ } PWND FASTCALL -co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest) +co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest, BOOL Ignore) { PWND Window; POINT Point = *WinPoint; @@ -2524,7 +2525,7 @@ ASSERT_REFS_CO(ScopeWin); UserRefObjectCo(ScopeWin, &Ref); - Window = co_WinPosSearchChildren(ScopeWin, &Point, HitTest); + Window = co_WinPosSearchChildren(ScopeWin, &Point, HitTest, Ignore); UserDerefObjectCo(ScopeWin); if (Window) @@ -3447,7 +3448,7 @@ UserRefObjectCo(DesktopWindow, &Ref); //pti = PsGetCurrentThreadWin32Thread(); - Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest); + Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest, FALSE); if (Window) { Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] Mon Mar 3 06:38:45 2014 @@ -52,7 +52,7 @@ BOOLEAN FASTCALL co_WinPosSetWindowPos(PWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, INT cy, UINT flags); BOOLEAN FASTCALL co_WinPosShowWindow(PWND Window, INT Cmd); void FASTCALL co_WinPosSendSizeMove(PWND Window); -PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest); +PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest, BOOL Ignore); VOID FASTCALL co_WinPosActivateOtherWindow(PWND); PWND FASTCALL IntRealChildWindowFromPoint(PWND,LONG,LONG); BOOL FASTCALL IntScreenToClient(PWND,LPPOINT);

10 years, 6 months

[hbelusca] 62409: [NTVDM]: Add a common helper to sync the BIOS cursor for the active display page, with VGA.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 3 00:09:22 2014 New Revision: 62409 URL: http://svn.reactos.org/svn/reactos?rev=62409&view=rev Log: [NTVDM]: Add a common helper to sync the BIOS cursor for the active display page, with VGA. Modified: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c branches/ntvdm/subsystems/ntvdm/bios/vidbios.h Modified: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Mon Mar 3 00:09:22 2014 @@ -880,24 +880,6 @@ VgaSetPalette(Palette, Size); } -static VOID VgaGetCursorPosition(PBYTE Row, PBYTE Column) -{ - SHORT ScreenColumns = VgaGetDisplayResolution().X; - BYTE OffsetLow, OffsetHigh; - WORD Offset; - - /* Get the cursor location */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); - OffsetLow = IOReadB(VGA_CRTC_DATA); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); - OffsetHigh = IOReadB(VGA_CRTC_DATA); - - Offset = MAKEWORD(OffsetLow, OffsetHigh); - - *Row = (BYTE)(Offset / ScreenColumns); - *Column = (BYTE)(Offset % ScreenColumns); -} - static VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) { /* Make sure the selected video page is valid */ @@ -927,6 +909,28 @@ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); IOWriteB(VGA_CRTC_DATA , HIBYTE(Offset)); } +} + +VOID VidBiosSyncCursorPosition(VOID) +{ + BYTE Row, Column; + BYTE Low, High; + SHORT ScreenColumns = VgaGetDisplayResolution().X; + WORD Offset; + + /* Get the cursor location */ + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); + Low = IOReadB(VGA_CRTC_DATA); + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); + High = IOReadB(VGA_CRTC_DATA); + + Offset = MAKEWORD(Low, High); + + Row = (BYTE)(Offset / ScreenColumns); + Column = (BYTE)(Offset % ScreenColumns); + + /* Synchronize our cursor position with VGA */ + VidBiosSetCursorPosition(Row, Column, Bda->VideoPage); } BYTE VidBiosGetVideoMode(VOID) @@ -1530,8 +1534,6 @@ BOOLEAN VidBiosInitialize(VOID) { - BYTE Row, Column; - /* Some interrupts are in fact addresses to tables */ ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; ((PULONG)BaseAddress)[0x1F] = (ULONG)NULL; @@ -1542,9 +1544,8 @@ /* Set the default video mode */ VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); - /* Update cursor position */ - VgaGetCursorPosition(&Row, &Column); - VidBiosSetCursorPosition(Row, Column, Bda->VideoPage); + /* Synchronize our cursor position with VGA */ + VidBiosSyncCursorPosition(); /* Register the BIOS support BOPs */ RegisterBop(BOP_VIDEO_INT, VidBiosVideoService); Modified: branches/ntvdm/subsystems/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/vidbios.h [iso-8859-1] Mon Mar 3 00:09:22 2014 @@ -39,6 +39,8 @@ VOID WINAPI VidBiosVideoService(LPWORD Stack); +VOID VidBiosSyncCursorPosition(VOID); + BOOLEAN VidBiosInitialize(VOID); VOID VidBiosCleanup(VOID);

10 years, 6 months

[ekohl] 62408: [SERVICES] RSetServiceStatus: Set the wait hint and check point only if the service is in a pending state, otherwise they should be 0.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 2 23:39:20 2014 New Revision: 62408 URL: http://svn.reactos.org/svn/reactos?rev=62408&view=rev Log: [SERVICES] RSetServiceStatus: Set the wait hint and check point only if the service is in a pending state, otherwise they should be 0. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Mar 2 23:39:20 2014 @@ -1661,6 +1661,16 @@ return ERROR_INVALID_DATA; } + /* Set the wait hint and check point only if the service is in a pending state, + otherwise they should be 0 */ + if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED || + lpServiceStatus->dwCurrentState == SERVICE_PAUSED || + lpServiceStatus->dwCurrentState == SERVICE_RUNNING) + { + lpServiceStatus->dwWaitHint = 0; + lpServiceStatus->dwCheckPoint = 0; + } + /* Lock the service database exclusively */ ScmLockDatabaseExclusive();

10 years, 6 months

[hbelusca] 62407: [NTVDM]: Improve some DPRINTs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 2 23:37:42 2014 New Revision: 62407 URL: http://svn.reactos.org/svn/reactos?rev=62407&view=rev Log: [NTVDM]: Improve some DPRINTs. Modified: branches/ntvdm/subsystems/ntvdm/dos/dem.c Modified: branches/ntvdm/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dem.… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sun Mar 2 23:37:42 2014 @@ -66,7 +66,12 @@ REAL_TO_PHYS(TO_LINEAR(getDI(), 0x0000)), ulDosKernelSize, &ulDosKernelSize); - DPRINT1("DOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + + DPRINT1("Windows NT DOS loading %s at 0x%04X:0x%04X, size 0x%x ; GetLastError() = %u\n", + (Success ? "succeeded" : "failed"), + getDI(), 0x0000, + ulDosKernelSize, + GetLastError()); /* Close the DOS kernel file */ FileClose(hDosKernel); @@ -203,7 +208,12 @@ REAL_TO_PHYS(TO_LINEAR(0x0070, 0x0000)), ulDosBiosSize, &ulDosBiosSize); - DPRINT1("DOS BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + + DPRINT1("DOS BIOS loading %s at 0x%04X:0x%04X, size 0x%x ; GetLastError() = %u\n", + (Success ? "succeeded" : "failed"), + 0x0070, 0x0000, + ulDosBiosSize, + GetLastError()); /* Close the DOS BIOS file */ FileClose(hDosBios);

10 years, 6 months

[hbelusca] 62406: [NTVDM] Refactor more code to move common BIOS code from our bios32 into /bios/ .

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 2 22:50:31 2014 New Revision: 62406 URL: http://svn.reactos.org/svn/reactos?rev=62406&view=rev Log: [NTVDM] Refactor more code to move common BIOS code from our bios32 into /bios/ . Added: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32p.h - copied, changed from r62377, branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c (with props) branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h (with props) branches/ntvdm/subsystems/ntvdm/bios/vidbios.c - copied, changed from r62381, branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c branches/ntvdm/subsystems/ntvdm/bios/vidbios.h - copied, changed from r62377, branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/bios/bios.h branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -10,7 +10,9 @@ bios/bios32/kbdbios32.c bios/bios32/vidbios32.c bios/bios.c + bios/kbdbios.c bios/rom.c + bios/vidbios.c hardware/cmos.c hardware/pic.c hardware/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -15,31 +15,44 @@ #include "bop.h" #include "bios.h" +#include "bios32/bios32.h" #include "rom.h" -/* PRIVATE VARIABLES **********************************************************/ - -static BOOLEAN Bios32Loaded = FALSE; - -static CALLBACK16 __BiosContext; +#include "io.h" +#include "hardware/cmos.h" + +/* DEFINES ********************************************************************/ /* BOP Identifiers */ #define BOP_BIOSINIT 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 // to let the virtual machine initialize itself // the IVT and its hardware. +#define BOP_EQUIPLIST 0x11 +#define BOP_GETMEMSIZE 0x12 + +/* PRIVATE VARIABLES **********************************************************/ + +static BOOLEAN Bios32Loaded = FALSE; + +static CALLBACK16 __BiosContext; +PBIOS_DATA_AREA Bda; /* PRIVATE FUNCTIONS **********************************************************/ static VOID WINAPI BiosInitBop(LPWORD Stack) { + BOOLEAN Success; + /* Load the second part of the Windows NTVDM BIOS image */ LPCSTR BiosFileName = "bios1.rom"; - PVOID BiosLocation = (PVOID)TO_LINEAR(BIOS_SEGMENT, 0x0000); - DWORD BiosSize = 0; - BOOLEAN Success; - - DPRINT1("You are loading Windows NTVDM BIOS!\n"); + PVOID BiosLocation = (PVOID)TO_LINEAR(BIOS_SEGMENT, 0x0000); + DWORD BiosSize = 0; + + /* Disable interrupts */ + setIF(0); + + DisplayMessage(L"You are loading Windows NTVDM BIOS!\n"); /* Initialize a private callback context */ InitializeContext(&__BiosContext, BIOS_SEGMENT, 0x0000); @@ -47,7 +60,12 @@ Success = LoadRom(BiosFileName, BiosLocation, &BiosSize); DPRINT1("BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - if (Success == FALSE) return; + if (Success == FALSE) + { + /* Stop the VDM */ + EmulatorTerminate(); + return; + } // DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" // L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", @@ -70,36 +88,69 @@ /* Initialize IVT and hardware */ + /* Initialize the Keyboard and Video BIOS */ + if (!KbdBiosInitialize() || !VidBiosInitialize()) + { + /* Stop the VDM */ + EmulatorTerminate(); + return; + } + /* Load VGA BIOS */ // Success = LoadRom("v7vga.rom", (PVOID)0xC0000, &BiosSize); // DPRINT1("VGA BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + /* Enable interrupts */ + setIF(1); + ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// /* Load some ROMs */ - Success = LoadRom("boot.bin", (PVOID)0xE0000, &BiosSize); - DPRINT1("Test ROM loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + // Success = LoadRom("boot.bin", (PVOID)0xE0000, &BiosSize); + // DPRINT1("Test ROM loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); SearchAndInitRoms(&__BiosContext); } /* PUBLIC FUNCTIONS ***********************************************************/ + +VOID WINAPI BiosEquipmentService(LPWORD Stack) +{ + /* Return the equipment list */ + setAX(Bda->EquipmentList); +} + +VOID WINAPI BiosGetMemorySize(LPWORD Stack) +{ + /* Return the conventional memory size in kB, typically 640 kB */ + setAX(Bda->MemorySize); +} BOOLEAN BiosInitialize(IN LPCSTR BiosFileName) { + BOOLEAN Success = FALSE; + + /* Disable interrupts */ + setIF(0); + + /* Initialize the BDA pointer */ + Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0); + /* Register the BIOS support BOPs */ - RegisterBop(BOP_BIOSINIT, BiosInitBop); + RegisterBop(BOP_BIOSINIT , BiosInitBop); + RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); + RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); if (BiosFileName) { - PVOID BiosLocation = NULL; - DWORD BiosSize = 0; - BOOLEAN Success = LoadBios(BiosFileName, &BiosLocation, &BiosSize); - + PVOID BiosLocation = NULL; + DWORD BiosSize = 0; + + Success = LoadBios(BiosFileName, &BiosLocation, &BiosSize); DPRINT1("BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - if (Success == FALSE) return FALSE; + if (!Success) return FALSE; DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", @@ -138,13 +189,17 @@ // setCS(0xF000); // setIP(0xFFF0); - return TRUE; + Success = TRUE; } else { - Bios32Loaded = Bios32Initialize(); - return Bios32Loaded; - } + Success = Bios32Loaded = Bios32Initialize(); + } + + /* Enable interrupts */ + setIF(1); + + return Success; } VOID Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -12,14 +12,15 @@ /* INCLUDES *******************************************************************/ #include "ntvdm.h" -#include "bios32/bios32.h" +#include "kbdbios.h" +#include "vidbios.h" /* DEFINES ********************************************************************/ -// #define BDA_SEGMENT 0x40 +#define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 -#if 0 +#define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now /* * BIOS Data Area at 0040:XXXX @@ -99,11 +100,12 @@ C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); -#endif - /* FUNCTIONS ******************************************************************/ extern PBIOS_DATA_AREA Bda; + +VOID WINAPI BiosEquipmentService(LPWORD Stack); +VOID WINAPI BiosGetMemorySize(LPWORD Stack); BOOLEAN BiosInitialize(IN LPCSTR BiosFileName); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -14,9 +14,12 @@ #include "callback.h" #include "bop.h" +#include "../bios.h" #include "../rom.h" -#include "../bios.h" #include "bios32.h" +#include "bios32p.h" +#include "kbdbios32.h" +#include "vidbios32.h" #include "io.h" #include "hardware/cmos.h" @@ -26,10 +29,6 @@ /* PRIVATE VARIABLES **********************************************************/ CALLBACK16 BiosContext; -PBIOS_DATA_AREA Bda; - -/* BOP Identifiers */ -#define BOP_GETMEMSIZE 0x12 /* PRIVATE FUNCTIONS **********************************************************/ @@ -38,18 +37,6 @@ /* Get the exception number and call the emulator API */ BYTE ExceptionNumber = LOBYTE(Stack[STACK_INT_NUM]); EmulatorException(ExceptionNumber, Stack); -} - -static VOID WINAPI BiosEquipmentService(LPWORD Stack) -{ - /* Return the equipment list */ - setAX(Bda->EquipmentList); -} - -static VOID WINAPI BiosGetMemorySize(LPWORD Stack) -{ - /* Return the conventional memory size in kB, typically 640 kB */ - setAX(Bda->MemorySize); } static VOID WINAPI BiosMiscService(LPWORD Stack) @@ -351,9 +338,6 @@ ((PULONG)BaseAddress)[0x46] = (ULONG)NULL; ((PULONG)BaseAddress)[0x48] = (ULONG)NULL; ((PULONG)BaseAddress)[0x49] = (ULONG)NULL; - - /* Register the BIOS support BOPs */ - RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -365,9 +349,6 @@ { BOOLEAN Success; UCHAR Low, High; - - /* Disable interrupts */ - setIF(0); /* Initialize the stack */ // That's what says IBM... (stack at 30:00FF going downwards) @@ -379,8 +360,7 @@ /* Set data segment */ setDS(BDA_SEGMENT); - /* Initialize the BDA */ - Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0); + /* Initialize the BDA contents */ Bda->EquipmentList = BIOS_EQUIPMENT_LIST; /* @@ -399,14 +379,8 @@ /* Initialize platform hardware (PIC/PIT chips, ...) */ BiosHwSetup(); - /* Initialize the Keyboard BIOS */ - if (!KbdBios32Initialize()) return FALSE; - - /* Initialize the Video BIOS */ - if (!VidBios32Initialize()) return FALSE; - - /* Enable interrupts */ - setIF(1); + /* Initialize the Keyboard and Video BIOS */ + if (!KbdBios32Initialize() || !VidBios32Initialize()) return FALSE; ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -12,122 +12,17 @@ /* INCLUDES *******************************************************************/ #include "ntvdm.h" -#include "kbdbios32.h" -#include "vidbios32.h" - -/**/ #include "callback.h" /**/ +// #include "../bios.h" /* DEFINES ********************************************************************/ -#define BIOS_PIC_MASTER_INT 0x08 -#define BIOS_PIC_SLAVE_INT 0x70 - -#define BIOS_EQUIPMENT_INTERRUPT 0x11 -#define BIOS_MEMORY_SIZE 0x12 -#define BIOS_MISC_INTERRUPT 0x15 -#define BIOS_TIME_INTERRUPT 0x1A -#define BIOS_SYS_TIMER_INTERRUPT 0x1C - -#define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now - - -#define BDA_SEGMENT 0x40 -// #define BIOS_SEGMENT 0xF000 - -/* - * BIOS Data Area at 0040:XXXX - * - * See: http://webpages.charter.net/danrollins/techhelp/0093.HTM - * and: http://www.bioscentral.com/misc/bda.htm - * for more information. - */ -#pragma pack(push, 1) -typedef struct -{ - WORD SerialPorts[4]; // 0x00 - WORD ParallelPorts[3]; // 0x08 - WORD EbdaSegment; // 0x0e - ParallelPort in PC/XT - WORD EquipmentList; // 0x10 - BYTE Reserved0; // 0x12 - Errors in PCjr infrared keyboard link - WORD MemorySize; // 0x13 - WORD Reserved1; // 0x15 - Scratch pad for manufacturing error tests - WORD KeybdShiftFlags; // 0x17 - BYTE AlternateKeypad; // 0x19 - WORD KeybdBufferHead; // 0x1a - WORD KeybdBufferTail; // 0x1c - WORD KeybdBuffer[BIOS_KBD_BUFFER_SIZE]; // 0x1e - BYTE DriveRecalibrate; // 0x3e - BYTE DriveMotorStatus; // 0x3f - BYTE MotorShutdownCounter; // 0x40 - BYTE LastDisketteOperation; // 0x41 - BYTE Reserved2[7]; // 0x42 - BYTE VideoMode; // 0x49 - WORD ScreenColumns; // 0x4a - WORD VideoPageSize; // 0x4c - WORD VideoPageOffset; // 0x4e - WORD CursorPosition[BIOS_MAX_PAGES]; // 0x50 - BYTE CursorEndLine; // 0x60 - BYTE CursorStartLine; // 0x61 - BYTE VideoPage; // 0x62 - WORD CrtBasePort; // 0x63 - BYTE CrtModeControl; // 0x65 - BYTE CrtColorPaletteMask; // 0x66 - BYTE CassetteData[5]; // 0x67 - DWORD TickCounter; // 0x6c - BYTE MidnightPassed; // 0x70 - BYTE BreakFlag; // 0x71 - WORD SoftReset; // 0x72 - BYTE LastDiskOperation; // 0x74 - BYTE NumDisks; // 0x75 - BYTE DriveControlByte; // 0x76 - BYTE DiskPortOffset; // 0x77 - BYTE LptTimeOut[4]; // 0x78 - BYTE ComTimeOut[4]; // 0x7c - WORD KeybdBufferStart; // 0x80 - WORD KeybdBufferEnd; // 0x82 - BYTE ScreenRows; // 0x84 - WORD CharacterHeight; // 0x85 - BYTE EGAFlags[2]; // 0x87 - BYTE VGAFlags[2]; // 0x89 - DWORD Reserved3; // 0x8b - BYTE Reserved4; // 0x8f - BYTE Reserved5[2]; // 0x90 - BYTE Reserved6[2]; // 0x92 - BYTE Reserved7[2]; // 0x94 - WORD Reserved8; // 0x96 - DWORD Reserved9; // 0x98 - DWORD Reserved10; // 0x9c - DWORD Reserved11[2]; // 0xa0 - DWORD EGAPtr; // 0xa8 - BYTE Reserved12[68]; // 0xac - BYTE Reserved13[16]; // 0xf0 - - DWORD Reserved14; // 0x100 - BYTE Reserved15[12]; // 0x104 - BYTE Reserved16[17]; // 0x110 - BYTE Reserved17[15]; // 0x121 - BYTE Reserved18[3]; // 0x130 -} BIOS_DATA_AREA, *PBIOS_DATA_AREA; -#pragma pack(pop) - -C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); +// #define BIOS_EQUIPMENT_INTERRUPT 0x11 +// #define BIOS_MEMORY_SIZE 0x12 +// #define BIOS_MISC_INTERRUPT 0x15 +// #define BIOS_TIME_INTERRUPT 0x1A +// #define BIOS_SYS_TIMER_INTERRUPT 0x1C /* FUNCTIONS ******************************************************************/ - -extern CALLBACK16 BiosContext; -#define RegisterBiosInt32(IntNumber, IntHandler) \ -do { \ - BiosContext.NextOffset += RegisterInt32(MAKELONG(BiosContext.NextOffset, \ - BiosContext.Segment), \ - (IntNumber), (IntHandler), NULL); \ -} while(0); - -extern PBIOS_DATA_AREA Bda; - -/**HACK!!**/typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack);/**HACK!!**/ - -VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); -VOID PicIRQComplete(LPWORD Stack); BOOLEAN Bios32Initialize(VOID); VOID Bios32Cleanup(VOID); Copied: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32p.h (from r62377, branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32p.h [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -6,14 +6,13 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#ifndef _BIOS32_H_ -#define _BIOS32_H_ +#ifndef _BIOS32P_H_ +#define _BIOS32P_H_ /* INCLUDES *******************************************************************/ #include "ntvdm.h" -#include "kbdbios32.h" -#include "vidbios32.h" +#include "../bios.h" /**/ #include "callback.h" /**/ @@ -28,90 +27,6 @@ #define BIOS_TIME_INTERRUPT 0x1A #define BIOS_SYS_TIMER_INTERRUPT 0x1C -#define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now - - -#define BDA_SEGMENT 0x40 -// #define BIOS_SEGMENT 0xF000 - -/* - * BIOS Data Area at 0040:XXXX - * - * See: http://webpages.charter.net/danrollins/techhelp/0093.HTM - * and: http://www.bioscentral.com/misc/bda.htm - * for more information. - */ -#pragma pack(push, 1) -typedef struct -{ - WORD SerialPorts[4]; // 0x00 - WORD ParallelPorts[3]; // 0x08 - WORD EbdaSegment; // 0x0e - ParallelPort in PC/XT - WORD EquipmentList; // 0x10 - BYTE Reserved0; // 0x12 - Errors in PCjr infrared keyboard link - WORD MemorySize; // 0x13 - WORD Reserved1; // 0x15 - Scratch pad for manufacturing error tests - WORD KeybdShiftFlags; // 0x17 - BYTE AlternateKeypad; // 0x19 - WORD KeybdBufferHead; // 0x1a - WORD KeybdBufferTail; // 0x1c - WORD KeybdBuffer[BIOS_KBD_BUFFER_SIZE]; // 0x1e - BYTE DriveRecalibrate; // 0x3e - BYTE DriveMotorStatus; // 0x3f - BYTE MotorShutdownCounter; // 0x40 - BYTE LastDisketteOperation; // 0x41 - BYTE Reserved2[7]; // 0x42 - BYTE VideoMode; // 0x49 - WORD ScreenColumns; // 0x4a - WORD VideoPageSize; // 0x4c - WORD VideoPageOffset; // 0x4e - WORD CursorPosition[BIOS_MAX_PAGES]; // 0x50 - BYTE CursorEndLine; // 0x60 - BYTE CursorStartLine; // 0x61 - BYTE VideoPage; // 0x62 - WORD CrtBasePort; // 0x63 - BYTE CrtModeControl; // 0x65 - BYTE CrtColorPaletteMask; // 0x66 - BYTE CassetteData[5]; // 0x67 - DWORD TickCounter; // 0x6c - BYTE MidnightPassed; // 0x70 - BYTE BreakFlag; // 0x71 - WORD SoftReset; // 0x72 - BYTE LastDiskOperation; // 0x74 - BYTE NumDisks; // 0x75 - BYTE DriveControlByte; // 0x76 - BYTE DiskPortOffset; // 0x77 - BYTE LptTimeOut[4]; // 0x78 - BYTE ComTimeOut[4]; // 0x7c - WORD KeybdBufferStart; // 0x80 - WORD KeybdBufferEnd; // 0x82 - BYTE ScreenRows; // 0x84 - WORD CharacterHeight; // 0x85 - BYTE EGAFlags[2]; // 0x87 - BYTE VGAFlags[2]; // 0x89 - DWORD Reserved3; // 0x8b - BYTE Reserved4; // 0x8f - BYTE Reserved5[2]; // 0x90 - BYTE Reserved6[2]; // 0x92 - BYTE Reserved7[2]; // 0x94 - WORD Reserved8; // 0x96 - DWORD Reserved9; // 0x98 - DWORD Reserved10; // 0x9c - DWORD Reserved11[2]; // 0xa0 - DWORD EGAPtr; // 0xa8 - BYTE Reserved12[68]; // 0xac - BYTE Reserved13[16]; // 0xf0 - - DWORD Reserved14; // 0x100 - BYTE Reserved15[12]; // 0x104 - BYTE Reserved16[17]; // 0x110 - BYTE Reserved17[15]; // 0x121 - BYTE Reserved18[3]; // 0x130 -} BIOS_DATA_AREA, *PBIOS_DATA_AREA; -#pragma pack(pop) - -C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); - /* FUNCTIONS ******************************************************************/ extern CALLBACK16 BiosContext; @@ -122,16 +37,9 @@ (IntNumber), (IntHandler), NULL); \ } while(0); -extern PBIOS_DATA_AREA Bda; - -/**HACK!!**/typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack);/**HACK!!**/ - VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); VOID PicIRQComplete(LPWORD Stack); -BOOLEAN Bios32Initialize(VOID); -VOID Bios32Cleanup(VOID); - -#endif // _BIOS32_H_ +#endif // _BIOS32P_H_ /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -13,8 +13,9 @@ #include "emulator.h" #include "callback.h" -// #include "kbdbios32.h" -#include "bios32.h" +#include "kbdbios32.h" +#include "../kbdbios.h" +#include "bios32p.h" #include "io.h" #include "hardware/ps2.h" @@ -263,6 +264,9 @@ BOOLEAN KbdBios32Initialize(VOID) { + /* Initialize the common Keyboard BIOS Support Library */ + if (!KbdBiosInitialize()) return FALSE; + /* Initialize the BDA */ Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); @@ -282,6 +286,8 @@ VOID KbdBios32Cleanup(VOID) { + /* Cleanup the common Keyboard BIOS Support Library */ + KbdBiosCleanup(); } /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -15,7 +15,7 @@ /* DEFINES ********************************************************************/ -#define BIOS_KBD_INTERRUPT 0x16 +// #define BIOS_KBD_INTERRUPT 0x16 #define BIOS_KBD_BUFFER_SIZE 16 @@ -38,8 +38,6 @@ /* FUNCTIONS ******************************************************************/ -WORD BiosGetCharacter(VOID); - BOOLEAN KbdBios32Initialize(VOID); VOID KbdBios32Cleanup(VOID); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -3,7 +3,9 @@ * PROJECT: ReactOS Virtual DOS Machine * FILE: vidbios32.c * PURPOSE: VDM Video 32-bit BIOS - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * NOTE: All of the real code is in bios/vidbios.c */ /* INCLUDES *******************************************************************/ @@ -13,1531 +15,16 @@ #include "emulator.h" #include "callback.h" -// #include "vidbios32.h" -#include "bios32.h" - -#include "io.h" -#include "hardware/vga.h" - -/* MACROS *********************************************************************/ - -// -// These macros are defined for ease-of-use of some VGA I/O ports -// whose addresses depend whether we are in Monochrome or Colour mode. -// -#define VGA_INSTAT1_READ Bda->CrtBasePort + 6 // VGA_INSTAT1_READ_MONO or VGA_INSTAT1_READ_COLOR -#define VGA_CRTC_INDEX Bda->CrtBasePort // VGA_CRTC_INDEX_MONO or VGA_CRTC_INDEX_COLOR -#define VGA_CRTC_DATA Bda->CrtBasePort + 1 // VGA_CRTC_DATA_MONO or VGA_CRTC_DATA_COLOR - -/* PRIVATE VARIABLES **********************************************************/ - -/* - * VGA Register Configurations for BIOS Video Modes - * The configurations come from DOSBox. - */ -static VGA_REGISTERS VideoMode_40x25_text = -{ - /* Miscellaneous Register */ - 0x67, - - /* Sequencer Registers */ - {0x00, 0x08, 0x03, 0x00, 0x07}, - - /* CRTC Registers */ - {0x2D, 0x27, 0x28, 0x90, 0x2B, 0xA0, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0E, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x1F, 0x96, 0xB9, 0xA3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00} -}; - -static VGA_REGISTERS VideoMode_80x25_text = -{ - /* Miscellaneous Register */ - 0x67, - - /* Sequencer Registers */ - {0x00, 0x00, 0x03, 0x00, 0x07}, - - /* CRTC Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0E, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x1F, 0x96, 0xB9, 0xA3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00} -}; - -static VGA_REGISTERS VideoMode_320x200_4color = -{ - /* Miscellaneous Register */ - 0x63, - - /* Sequencer Registers */ - {0x00, 0x09, 0x03, 0x00, 0x02}, - - /* CRTC Registers */ - {0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x00, 0x96, 0xB9, 0xA2, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0F, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x13, 0x15, 0x17, 0x02, 0x04, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, - 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00} -}; - -static VGA_REGISTERS VideoMode_640x200_2color = -{ - /* Miscellaneous Register */ - 0x63, - - /* Sequencer Registers */ - {0x00, 0x09, 0x0F, 0x00, 0x02}, - - /* CRTC Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x00, 0x96, 0xB9, 0xC2, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, - 0x17, 0x17, 0x17, 0x17, 0x01, 0x00, 0x01, 0x00, 0x00} -}; - -static VGA_REGISTERS VideoMode_320x200_16color = -{ - /* Miscellaneous Register */ - 0x63, - - /* Sequencer Registers */ - {0x00, 0x09, 0x0F, 0x00, 0x02}, - - /* CRTC Registers */ - {0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x00, 0x96, 0xB9, 0xE3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, - - /* AC Registers */ -// {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, -// 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, - 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00} -}; - -static VGA_REGISTERS VideoMode_640x200_16color = -{ - /* Miscellaneous Register */ - 0x63, - - /* Sequencer Registers */ - {0x00, 0x01, 0x0F, 0x00, 0x02}, - - /* CRTC Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0xC0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x00, 0x96, 0xB9, 0xE3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, - - /* AC Registers */ -// {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, -// 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, - 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00} -}; - -static VGA_REGISTERS VideoMode_640x350_16color = -{ - /* Miscellaneous Register */ - 0xA3, - - /* Sequencer Registers */ - {0x00, 0x01, 0x0F, 0x00, 0x02}, - - /* CRTC Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x83, 0x85, 0x5D, 0x28, 0x0F, 0x63, 0xBA, 0xE3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} -}; - -static VGA_REGISTERS VideoMode_640x480_2color = -{ - /* Miscellaneous Register */ - 0xE3, - - /* Sequencer Registers */ - {0x00, 0x01, 0x0F, 0x00, 0x02}, - - /* CRTC Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xEA, 0x8C, 0xDF, 0x28, 0x00, 0xE7, 0x04, 0xC3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, - 0x3F, 0x3F, 0x3F, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} -}; - -static VGA_REGISTERS VideoMode_640x480_16color = -{ - /* Miscellaneous Register */ - 0xE3, - - /* Sequencer Registers */ - {0x00, 0x01, 0x0F, 0x00, 0x02}, - - /* CRTC Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xEA, 0x8C, 0xDF, 0x28, 0x00, 0xE7, 0x04, 0xE3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} -}; - -static VGA_REGISTERS VideoMode_320x200_256color = -{ - /* Miscellaneous Register */ - 0x63, - - /* Sequencer Registers */ - {0x00, 0x01, 0x0F, 0x00, 0x0E}, - - /* CRTC Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0x41, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x40, 0x96, 0xB9, 0xA3, - 0xFF}, - - /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, 0xFF}, - - /* AC Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00} -}; - -/* See http://wiki.osdev.org/Drawing_In_Protected_Mode#Locating_Video_Memory */ -static PVGA_REGISTERS VideoModes[BIOS_MAX_VIDEO_MODE + 1] = -{ - &VideoMode_40x25_text, /* Mode 00h */ // 16 color (mono) - &VideoMode_40x25_text, /* Mode 01h */ // 16 color - &VideoMode_80x25_text, /* Mode 02h */ // 16 color (mono) - &VideoMode_80x25_text, /* Mode 03h */ // 16 color - &VideoMode_320x200_4color, /* Mode 04h */ // CGA 4 color - &VideoMode_320x200_4color, /* Mode 05h */ // CGA same (m) - &VideoMode_640x200_2color, /* Mode 06h */ // CGA 640*200 2 color - NULL, /* Mode 07h */ // MDA monochrome text 80*25 - NULL, /* Mode 08h */ // PCjr - NULL, /* Mode 09h */ // PCjr - NULL, /* Mode 0Ah */ // PCjr - NULL, /* Mode 0Bh */ // Reserved - NULL, /* Mode 0Ch */ // Reserved - &VideoMode_320x200_16color, /* Mode 0Dh */ // EGA 320*200 16 color - &VideoMode_640x200_16color, /* Mode 0Eh */ // EGA 640*200 16 color - NULL, /* Mode 0Fh */ // EGA 640*350 mono - &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 HiRes 16 color - &VideoMode_640x480_2color, /* Mode 11h */ // VGA 640*480 mono - &VideoMode_640x480_16color, /* Mode 12h */ // VGA - &VideoMode_320x200_256color, /* Mode 13h */ // VGA -}; - -// FIXME: Are they computable with the previous data ?? -// Values taken from DOSBox. -static WORD VideoModePageSize[BIOS_MAX_VIDEO_MODE + 1] = -{ - 0x0800, 0x0800, 0x1000, 0x1000, - 0x4000, 0x4000, 0x4000, 0x1000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x2000, 0x4000, 0x8000, - 0x8000, 0xA000, 0xA000, 0x2000 -}; - -/* - * BIOS Mode Palettes - * - * Many people have different versions of those palettes - * (e.g. DOSBox, http://www.brokenthorn.com/Resources/OSDevVid2.html , - * etc...) A choice should be made at some point. - */ - -// This is the same as EgaPalette__HiRes -static CONST COLORREF TextPalette[VGA_MAX_COLORS / 4] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), - RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), - - RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), - RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), - RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), - RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), - - - RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), - RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), - RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), - - RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), - RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) -}; - -// Unused at the moment -static CONST COLORREF mtext_palette[64] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), - - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF) -}; - -// Unused at the moment -static CONST COLORREF mtext_s3_palette[64] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), - - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), - RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF) -}; - -// Unused at the moment -static CONST COLORREF CgaPalette[16] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) -}; - -// Unused at the moment -static CONST COLORREF CgaPalette2[VGA_MAX_COLORS / 4] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) -}; - -static CONST COLORREF EgaPalette___16ColorFixed_DOSBox[VGA_MAX_COLORS / 4] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - - - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - - - - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - - - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) -}; - -// This is the same as TextPalette -static CONST COLORREF EgaPalette__HiRes[VGA_MAX_COLORS / 4] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), - RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), - - RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), - RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), - RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), - RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), - - - RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), - RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), - RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), - - RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), - RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) -}; - -#define USE_REACTOS_COLORS -// #define USE_DOSBOX_COLORS - -/* - * Same palette as the default one 'VgaDefaultPalette' in vga.c - */ -#if defined(USE_REACTOS_COLORS) - -// ReactOS colors -static CONST COLORREF VgaPalette[VGA_MAX_COLORS] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - RGB(0x00, 0x00, 0x00), RGB(0x10, 0x10, 0x10), RGB(0x20, 0x20, 0x20), RGB(0x35, 0x35, 0x35), - RGB(0x45, 0x45, 0x45), RGB(0x55, 0x55, 0x55), RGB(0x65, 0x65, 0x65), RGB(0x75, 0x75, 0x75), - RGB(0x8A, 0x8A, 0x8A), RGB(0x9A, 0x9A, 0x9A), RGB(0xAA, 0xAA, 0xAA), RGB(0xBA, 0xBA, 0xBA), - RGB(0xCA, 0xCA, 0xCA), RGB(0xDF, 0xDF, 0xDF), RGB(0xEF, 0xEF, 0xEF), RGB(0xFF, 0xFF, 0xFF), - RGB(0x00, 0x00, 0xFF), RGB(0x41, 0x00, 0xFF), RGB(0x82, 0x00, 0xFF), RGB(0xBE, 0x00, 0xFF), - RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0x00, 0xBE), RGB(0xFF, 0x00, 0x82), RGB(0xFF, 0x00, 0x41), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x41, 0x00), RGB(0xFF, 0x82, 0x00), RGB(0xFF, 0xBE, 0x00), - RGB(0xFF, 0xFF, 0x00), RGB(0xBE, 0xFF, 0x00), RGB(0x82, 0xFF, 0x00), RGB(0x41, 0xFF, 0x00), - RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0x41), RGB(0x00, 0xFF, 0x82), RGB(0x00, 0xFF, 0xBE), - RGB(0x00, 0xFF, 0xFF), RGB(0x00, 0xBE, 0xFF), RGB(0x00, 0x82, 0xFF), RGB(0x00, 0x41, 0xFF), - RGB(0x82, 0x82, 0xFF), RGB(0x9E, 0x82, 0xFF), RGB(0xBE, 0x82, 0xFF), RGB(0xDF, 0x82, 0xFF), - RGB(0xFF, 0x82, 0xFF), RGB(0xFF, 0x82, 0xDF), RGB(0xFF, 0x82, 0xBE), RGB(0xFF, 0x82, 0x9E), - RGB(0xFF, 0x82, 0x82), RGB(0xFF, 0x9E, 0x82), RGB(0xFF, 0xBE, 0x82), RGB(0xFF, 0xDF, 0x82), - RGB(0xFF, 0xFF, 0x82), RGB(0xDF, 0xFF, 0x82), RGB(0xBE, 0xFF, 0x82), RGB(0x9E, 0xFF, 0x82), - RGB(0x82, 0xFF, 0x82), RGB(0x82, 0xFF, 0x9E), RGB(0x82, 0xFF, 0xBE), RGB(0x82, 0xFF, 0xDF), - RGB(0x82, 0xFF, 0xFF), RGB(0x82, 0xDF, 0xFF), RGB(0x82, 0xBE, 0xFF), RGB(0x82, 0x9E, 0xFF), - RGB(0xBA, 0xBA, 0xFF), RGB(0xCA, 0xBA, 0xFF), RGB(0xDF, 0xBA, 0xFF), RGB(0xEF, 0xBA, 0xFF), - RGB(0xFF, 0xBA, 0xFF), RGB(0xFF, 0xBA, 0xEF), RGB(0xFF, 0xBA, 0xDF), RGB(0xFF, 0xBA, 0xCA), - RGB(0xFF, 0xBA, 0xBA), RGB(0xFF, 0xCA, 0xBA), RGB(0xFF, 0xDF, 0xBA), RGB(0xFF, 0xEF, 0xBA), - RGB(0xFF, 0xFF, 0xBA), RGB(0xEF, 0xFF, 0xBA), RGB(0xDF, 0xFF, 0xBA), RGB(0xCA, 0xFF, 0xBA), - RGB(0xBA, 0xFF, 0xBA), RGB(0xBA, 0xFF, 0xCA), RGB(0xBA, 0xFF, 0xDF), RGB(0xBA, 0xFF, 0xEF), - RGB(0xBA, 0xFF, 0xFF), RGB(0xBA, 0xEF, 0xFF), RGB(0xBA, 0xDF, 0xFF), RGB(0xBA, 0xCA, 0xFF), - RGB(0x00, 0x00, 0x71), RGB(0x1C, 0x00, 0x71), RGB(0x39, 0x00, 0x71), RGB(0x55, 0x00, 0x71), - RGB(0x71, 0x00, 0x71), RGB(0x71, 0x00, 0x55), RGB(0x71, 0x00, 0x39), RGB(0x71, 0x00, 0x1C), - RGB(0x71, 0x00, 0x00), RGB(0x71, 0x1C, 0x00), RGB(0x71, 0x39, 0x00), RGB(0x71, 0x55, 0x00), - RGB(0x71, 0x71, 0x00), RGB(0x55, 0x71, 0x00), RGB(0x39, 0x71, 0x00), RGB(0x1C, 0x71, 0x00), - RGB(0x00, 0x71, 0x00), RGB(0x00, 0x71, 0x1C), RGB(0x00, 0x71, 0x39), RGB(0x00, 0x71, 0x55), - RGB(0x00, 0x71, 0x71), RGB(0x00, 0x55, 0x71), RGB(0x00, 0x39, 0x71), RGB(0x00, 0x1C, 0x71), - RGB(0x39, 0x39, 0x71), RGB(0x45, 0x39, 0x71), RGB(0x55, 0x39, 0x71), RGB(0x61, 0x39, 0x71), - RGB(0x71, 0x39, 0x71), RGB(0x71, 0x39, 0x61), RGB(0x71, 0x39, 0x55), RGB(0x71, 0x39, 0x45), - RGB(0x71, 0x39, 0x39), RGB(0x71, 0x45, 0x39), RGB(0x71, 0x55, 0x39), RGB(0x71, 0x61, 0x39), - RGB(0x71, 0x71, 0x39), RGB(0x61, 0x71, 0x39), RGB(0x55, 0x71, 0x39), RGB(0x45, 0x71, 0x39), - RGB(0x39, 0x71, 0x39), RGB(0x39, 0x71, 0x45), RGB(0x39, 0x71, 0x55), RGB(0x39, 0x71, 0x61), - RGB(0x39, 0x71, 0x71), RGB(0x39, 0x61, 0x71), RGB(0x39, 0x55, 0x71), RGB(0x39, 0x45, 0x71), - RGB(0x51, 0x51, 0x71), RGB(0x59, 0x51, 0x71), RGB(0x61, 0x51, 0x71), RGB(0x69, 0x51, 0x71), - RGB(0x71, 0x51, 0x71), RGB(0x71, 0x51, 0x69), RGB(0x71, 0x51, 0x61), RGB(0x71, 0x51, 0x59), - RGB(0x71, 0x51, 0x51), RGB(0x71, 0x59, 0x51), RGB(0x71, 0x61, 0x51), RGB(0x71, 0x69, 0x51), - RGB(0x71, 0x71, 0x51), RGB(0x69, 0x71, 0x51), RGB(0x61, 0x71, 0x51), RGB(0x59, 0x71, 0x51), - RGB(0x51, 0x71, 0x51), RGB(0x51, 0x71, 0x59), RGB(0x51, 0x71, 0x61), RGB(0x51, 0x71, 0x69), - RGB(0x51, 0x71, 0x71), RGB(0x51, 0x69, 0x71), RGB(0x51, 0x61, 0x71), RGB(0x51, 0x59, 0x71), - RGB(0x00, 0x00, 0x41), RGB(0x10, 0x00, 0x41), RGB(0x20, 0x00, 0x41), RGB(0x31, 0x00, 0x41), - RGB(0x41, 0x00, 0x41), RGB(0x41, 0x00, 0x31), RGB(0x41, 0x00, 0x20), RGB(0x41, 0x00, 0x10), - RGB(0x41, 0x00, 0x00), RGB(0x41, 0x10, 0x00), RGB(0x41, 0x20, 0x00), RGB(0x41, 0x31, 0x00), - RGB(0x41, 0x41, 0x00), RGB(0x31, 0x41, 0x00), RGB(0x20, 0x41, 0x00), RGB(0x10, 0x41, 0x00), - RGB(0x00, 0x41, 0x00), RGB(0x00, 0x41, 0x10), RGB(0x00, 0x41, 0x20), RGB(0x00, 0x41, 0x31), - RGB(0x00, 0x41, 0x41), RGB(0x00, 0x31, 0x41), RGB(0x00, 0x20, 0x41), RGB(0x00, 0x10, 0x41), - RGB(0x20, 0x20, 0x41), RGB(0x28, 0x20, 0x41), RGB(0x31, 0x20, 0x41), RGB(0x39, 0x20, 0x41), - RGB(0x41, 0x20, 0x41), RGB(0x41, 0x20, 0x39), RGB(0x41, 0x20, 0x31), RGB(0x41, 0x20, 0x28), - RGB(0x41, 0x20, 0x20), RGB(0x41, 0x28, 0x20), RGB(0x41, 0x31, 0x20), RGB(0x41, 0x39, 0x20), - RGB(0x41, 0x41, 0x20), RGB(0x39, 0x41, 0x20), RGB(0x31, 0x41, 0x20), RGB(0x28, 0x41, 0x20), - RGB(0x20, 0x41, 0x20), RGB(0x20, 0x41, 0x28), RGB(0x20, 0x41, 0x31), RGB(0x20, 0x41, 0x39), - RGB(0x20, 0x41, 0x41), RGB(0x20, 0x39, 0x41), RGB(0x20, 0x31, 0x41), RGB(0x20, 0x28, 0x41), - RGB(0x2D, 0x2D, 0x41), RGB(0x31, 0x2D, 0x41), RGB(0x35, 0x2D, 0x41), RGB(0x3D, 0x2D, 0x41), - RGB(0x41, 0x2D, 0x41), RGB(0x41, 0x2D, 0x3D), RGB(0x41, 0x2D, 0x35), RGB(0x41, 0x2D, 0x31), - RGB(0x41, 0x2D, 0x2D), RGB(0x41, 0x31, 0x2D), RGB(0x41, 0x35, 0x2D), RGB(0x41, 0x3D, 0x2D), - RGB(0x41, 0x41, 0x2D), RGB(0x3D, 0x41, 0x2D), RGB(0x35, 0x41, 0x2D), RGB(0x31, 0x41, 0x2D), - RGB(0x2D, 0x41, 0x2D), RGB(0x2D, 0x41, 0x31), RGB(0x2D, 0x41, 0x35), RGB(0x2D, 0x41, 0x3D), - RGB(0x2D, 0x41, 0x41), RGB(0x2D, 0x3D, 0x41), RGB(0x2D, 0x35, 0x41), RGB(0x2D, 0x31, 0x41), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00) -}; - -#elif defined(USE_DOSBOX_COLORS) - -// DOSBox colors -static CONST COLORREF VgaPalette[VGA_MAX_COLORS] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), - RGB(0x00, 0x00, 0x00), RGB(0x14, 0x14, 0x14), RGB(0x20, 0x20, 0x20), RGB(0x2C, 0x2C, 0x2C), - RGB(0x38, 0x38, 0x38), RGB(0x45, 0x45, 0x45), RGB(0x51, 0x51, 0x51), RGB(0x61, 0x61, 0x61), - RGB(0x71, 0x71, 0x71), RGB(0x82, 0x82, 0x82), RGB(0x92, 0x92, 0x92), RGB(0xA2, 0xA2, 0xA2), - RGB(0xB6, 0xB6, 0xB6), RGB(0xCB, 0xCB, 0xCB), RGB(0xE3, 0xE3, 0xE3), RGB(0xFF, 0xFF, 0xFF), - RGB(0x00, 0x00, 0xFF), RGB(0x41, 0x00, 0xFF), RGB(0x7D, 0x00, 0xFF), RGB(0xBE, 0x00, 0xFF), - RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0x00, 0xBE), RGB(0xFF, 0x00, 0x7D), RGB(0xFF, 0x00, 0x41), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x41, 0x00), RGB(0xFF, 0x7D, 0x00), RGB(0xFF, 0xBE, 0x00), - RGB(0xFF, 0xFF, 0x00), RGB(0xBE, 0xFF, 0x00), RGB(0x7D, 0xFF, 0x00), RGB(0x41, 0xFF, 0x00), - RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0x41), RGB(0x00, 0xFF, 0x7D), RGB(0x00, 0xFF, 0xBE), - RGB(0x00, 0xFF, 0xFF), RGB(0x00, 0xBE, 0xFF), RGB(0x00, 0x7D, 0xFF), RGB(0x00, 0x41, 0xFF), - RGB(0x7D, 0x7D, 0xFF), RGB(0x9E, 0x7D, 0xFF), RGB(0xBE, 0x7D, 0xFF), RGB(0xDF, 0x7D, 0xFF), - RGB(0xFF, 0x7D, 0xFF), RGB(0xFF, 0x7D, 0xDF), RGB(0xFF, 0x7D, 0xBE), RGB(0xFF, 0x7D, 0x9E), - - RGB(0xFF, 0x7D, 0x7D), RGB(0xFF, 0x9E, 0x7D), RGB(0xFF, 0xBE, 0x7D), RGB(0xFF, 0xDF, 0x7D), - RGB(0xFF, 0xFF, 0x7D), RGB(0xDF, 0xFF, 0x7D), RGB(0xBE, 0xFF, 0x7D), RGB(0x9E, 0xFF, 0x7D), - RGB(0x7D, 0xFF, 0x7D), RGB(0x7D, 0xFF, 0x9E), RGB(0x7D, 0xFF, 0xBE), RGB(0x7D, 0xFF, 0xDF), - RGB(0x7D, 0xFF, 0xFF), RGB(0x7D, 0xDF, 0xFF), RGB(0x7D, 0xBE, 0xFF), RGB(0x7D, 0x9E, 0xFF), - RGB(0xB6, 0xB6, 0xFF), RGB(0xC7, 0xB6, 0xFF), RGB(0xDB, 0xB6, 0xFF), RGB(0xEB, 0xB6, 0xFF), - RGB(0xFF, 0xB6, 0xFF), RGB(0xFF, 0xB6, 0xEB), RGB(0xFF, 0xB6, 0xDB), RGB(0xFF, 0xB6, 0xC7), - RGB(0xFF, 0xB6, 0xB6), RGB(0xFF, 0xC7, 0xB6), RGB(0xFF, 0xDB, 0xB6), RGB(0xFF, 0xEB, 0xB6), - RGB(0xFF, 0xFF, 0xB6), RGB(0xEB, 0xFF, 0xB6), RGB(0xDB, 0xFF, 0xB6), RGB(0xC7, 0xFF, 0xB6), - RGB(0xB6, 0xFF, 0xB6), RGB(0xB6, 0xFF, 0xC7), RGB(0xB6, 0xFF, 0xDB), RGB(0xB6, 0xFF, 0xEB), - RGB(0xB6, 0xFF, 0xFF), RGB(0xB6, 0xEB, 0xFF), RGB(0xB6, 0xDB, 0xFF), RGB(0xB6, 0xC7, 0xFF), - RGB(0x00, 0x00, 0x71), RGB(0x1C, 0x00, 0x71), RGB(0x38, 0x00, 0x71), RGB(0x55, 0x00, 0x71), - RGB(0x71, 0x00, 0x71), RGB(0x71, 0x00, 0x55), RGB(0x71, 0x00, 0x38), RGB(0x71, 0x00, 0x1C), - RGB(0x71, 0x00, 0x00), RGB(0x71, 0x1C, 0x00), RGB(0x71, 0x38, 0x00), RGB(0x71, 0x55, 0x00), - RGB(0x71, 0x71, 0x00), RGB(0x55, 0x71, 0x00), RGB(0x38, 0x71, 0x00), RGB(0x1C, 0x71, 0x00), - RGB(0x00, 0x71, 0x00), RGB(0x00, 0x71, 0x1C), RGB(0x00, 0x71, 0x38), RGB(0x00, 0x71, 0x55), - RGB(0x00, 0x71, 0x71), RGB(0x00, 0x55, 0x71), RGB(0x00, 0x38, 0x71), RGB(0x00, 0x1C, 0x71), - - RGB(0x38, 0x38, 0x71), RGB(0x45, 0x38, 0x71), RGB(0x55, 0x38, 0x71), RGB(0x61, 0x38, 0x71), - RGB(0x71, 0x38, 0x71), RGB(0x71, 0x38, 0x61), RGB(0x71, 0x38, 0x55), RGB(0x71, 0x38, 0x45), - RGB(0x71, 0x38, 0x38), RGB(0x71, 0x45, 0x38), RGB(0x71, 0x55, 0x38), RGB(0x71, 0x61, 0x38), - RGB(0x71, 0x71, 0x38), RGB(0x61, 0x71, 0x38), RGB(0x55, 0x71, 0x38), RGB(0x45, 0x71, 0x38), - RGB(0x38, 0x71, 0x38), RGB(0x38, 0x71, 0x45), RGB(0x38, 0x71, 0x55), RGB(0x38, 0x71, 0x61), - RGB(0x38, 0x71, 0x71), RGB(0x38, 0x61, 0x71), RGB(0x38, 0x55, 0x71), RGB(0x38, 0x45, 0x71), - RGB(0x51, 0x51, 0x71), RGB(0x59, 0x51, 0x71), RGB(0x61, 0x51, 0x71), RGB(0x69, 0x51, 0x71), - RGB(0x71, 0x51, 0x71), RGB(0x71, 0x51, 0x69), RGB(0x71, 0x51, 0x61), RGB(0x71, 0x51, 0x59), - RGB(0x71, 0x51, 0x51), RGB(0x71, 0x59, 0x51), RGB(0x71, 0x61, 0x51), RGB(0x71, 0x69, 0x51), - RGB(0x71, 0x71, 0x51), RGB(0x69, 0x71, 0x51), RGB(0x61, 0x71, 0x51), RGB(0x59, 0x71, 0x51), - RGB(0x51, 0x71, 0x51), RGB(0x51, 0x71, 0x59), RGB(0x51, 0x71, 0x61), RGB(0x51, 0x71, 0x69), - RGB(0x51, 0x71, 0x71), RGB(0x51, 0x69, 0x71), RGB(0x51, 0x61, 0x71), RGB(0x51, 0x59, 0x71), - RGB(0x00, 0x00, 0x41), RGB(0x10, 0x00, 0x41), RGB(0x20, 0x00, 0x41), RGB(0x30, 0x00, 0x41), - RGB(0x41, 0x00, 0x41), RGB(0x41, 0x00, 0x30), RGB(0x41, 0x00, 0x20), RGB(0x41, 0x00, 0x10), - RGB(0x41, 0x00, 0x00), RGB(0x41, 0x10, 0x00), RGB(0x41, 0x20, 0x00), RGB(0x41, 0x30, 0x00), - RGB(0x41, 0x41, 0x00), RGB(0x30, 0x41, 0x00), RGB(0x20, 0x41, 0x00), RGB(0x10, 0x41, 0x00), - - RGB(0x00, 0x41, 0x00), RGB(0x00, 0x41, 0x10), RGB(0x00, 0x41, 0x20), RGB(0x00, 0x41, 0x30), - RGB(0x00, 0x41, 0x41), RGB(0x00, 0x30, 0x41), RGB(0x00, 0x20, 0x41), RGB(0x00, 0x10, 0x41), - RGB(0x20, 0x20, 0x41), RGB(0x28, 0x20, 0x41), RGB(0x30, 0x20, 0x41), RGB(0x38, 0x20, 0x41), - RGB(0x41, 0x20, 0x41), RGB(0x41, 0x20, 0x38), RGB(0x41, 0x20, 0x30), RGB(0x41, 0x20, 0x28), - RGB(0x41, 0x20, 0x20), RGB(0x41, 0x28, 0x20), RGB(0x41, 0x30, 0x20), RGB(0x41, 0x38, 0x20), - RGB(0x41, 0x41, 0x20), RGB(0x38, 0x41, 0x20), RGB(0x30, 0x41, 0x20), RGB(0x28, 0x41, 0x20), - RGB(0x20, 0x41, 0x20), RGB(0x20, 0x41, 0x28), RGB(0x20, 0x41, 0x30), RGB(0x20, 0x41, 0x38), - RGB(0x20, 0x41, 0x41), RGB(0x20, 0x38, 0x41), RGB(0x20, 0x30, 0x41), RGB(0x20, 0x28, 0x41), - RGB(0x2C, 0x2C, 0x41), RGB(0x30, 0x2C, 0x41), RGB(0x34, 0x2C, 0x41), RGB(0x3C, 0x2C, 0x41), - RGB(0x41, 0x2C, 0x41), RGB(0x41, 0x2C, 0x3C), RGB(0x41, 0x2C, 0x34), RGB(0x41, 0x2C, 0x30), - RGB(0x41, 0x2C, 0x2C), RGB(0x41, 0x30, 0x2C), RGB(0x41, 0x34, 0x2C), RGB(0x41, 0x3C, 0x2C), - RGB(0x41, 0x41, 0x2C), RGB(0x3C, 0x41, 0x2C), RGB(0x34, 0x41, 0x2C), RGB(0x30, 0x41, 0x2C), - RGB(0x2C, 0x41, 0x2C), RGB(0x2C, 0x41, 0x30), RGB(0x2C, 0x41, 0x34), RGB(0x2C, 0x41, 0x3C), - RGB(0x2C, 0x41, 0x41), RGB(0x2C, 0x3C, 0x41), RGB(0x2C, 0x34, 0x41), RGB(0x2C, 0x30, 0x41), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00) -}; - -#endif - -/* PRIVATE FUNCTIONS **********************************************************/ - -static VOID VidBiosReadWindow(LPWORD Buffer, SMALL_RECT Rectangle, BYTE Page) -{ - INT i, j; - INT Counter = 0; - WORD Character; - DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Page * Bda->VideoPageSize); - - for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) - { - for (j = Rectangle.Left; j <= Rectangle.Right; j++) - { - /* Read from video memory */ - EmulatorReadMemory(&EmulatorContext, - VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); - - /* Write the data to the buffer in row order */ - Buffer[Counter++] = Character; - } - } -} - -static VOID VidBiosWriteWindow(LPWORD Buffer, SMALL_RECT Rectangle, BYTE Page) -{ - INT i, j; - INT Counter = 0; - WORD Character; - DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Page * Bda->VideoPageSize); - - for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) - { - for (j = Rectangle.Left; j <= Rectangle.Right; j++) - { - Character = Buffer[Counter++]; - - /* Write to video memory */ - EmulatorWriteMemory(&EmulatorContext, - VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); - } - } -} - -static BOOLEAN VidBiosScrollWindow(INT Direction, - DWORD Amount, - SMALL_RECT Rectangle, - BYTE Page, - BYTE FillAttribute) -{ - DWORD i; - LPWORD WindowData; - WORD WindowWidth = Rectangle.Right - Rectangle.Left + 1; - WORD WindowHeight = Rectangle.Bottom - Rectangle.Top + 1; - DWORD WindowSize = WindowWidth * WindowHeight; - - /* Allocate a buffer for the window */ - WindowData = (LPWORD)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - WindowSize * sizeof(WORD)); - if (WindowData == NULL) return FALSE; - - /* Read the window data */ - VidBiosReadWindow(WindowData, Rectangle, Page); - - if ((Amount == 0) - || (((Direction == SCROLL_DIRECTION_UP) - || (Direction == SCROLL_DIRECTION_DOWN)) - && (Amount >= WindowHeight)) - || (((Direction == SCROLL_DIRECTION_LEFT) - || (Direction == SCROLL_DIRECTION_RIGHT)) - && (Amount >= WindowWidth))) - { - /* Fill the window */ - for (i = 0; i < WindowSize; i++) - { - WindowData[i] = MAKEWORD(' ', FillAttribute); - } - - goto Done; - } - - switch (Direction) - { - case SCROLL_DIRECTION_UP: - { - RtlMoveMemory(WindowData, - &WindowData[WindowWidth * Amount], - (WindowSize - WindowWidth * Amount) * sizeof(WORD)); - - for (i = 0; i < Amount * WindowWidth; i++) - { - WindowData[WindowSize - i - 1] = MAKEWORD(' ', FillAttribute); - } - - break; - } - - case SCROLL_DIRECTION_DOWN: - { - RtlMoveMemory(&WindowData[WindowWidth * Amount], - WindowData, - (WindowSize - WindowWidth * Amount) * sizeof(WORD)); - - for (i = 0; i < Amount * WindowWidth; i++) - { - WindowData[i] = MAKEWORD(' ', FillAttribute); - } - - break; - } - - default: - { - // TODO: NOT IMPLEMENTED! - UNIMPLEMENTED; - } - } - -Done: - /* Write back the window data */ - VidBiosWriteWindow(WindowData, Rectangle, Page); - - /* Free the window buffer */ - HeapFree(GetProcessHeap(), 0, WindowData); - - return TRUE; -} - -static BOOLEAN VgaSetRegisters(PVGA_REGISTERS Registers) -{ - INT i; - - if (Registers == NULL) return FALSE; - - /* Disable interrupts */ - setIF(0); - - /* - * Set the CRT base address according to the selected mode, - * monochrome or color. The following macros: - * VGA_INSTAT1_READ, VGA_CRTC_INDEX and VGA_CRTC_DATA are then - * used to access the correct VGA I/O ports. - */ - Bda->CrtBasePort = (Registers->Misc & 0x01) ? VGA_CRTC_INDEX_COLOR - : VGA_CRTC_INDEX_MONO; - - /* Write the misc register */ - IOWriteB(VGA_MISC_WRITE, Registers->Misc); - - /* Synchronous reset on */ - IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_RESET_REG); - IOWriteB(VGA_SEQ_DATA , VGA_SEQ_RESET_AR); - - /* Write the sequencer registers */ - for (i = 1; i < VGA_SEQ_MAX_REG; i++) - { - IOWriteB(VGA_SEQ_INDEX, i); - IOWriteB(VGA_SEQ_DATA, Registers->Sequencer[i]); - } - - /* Synchronous reset off */ - IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_RESET_REG); - IOWriteB(VGA_SEQ_DATA , VGA_SEQ_RESET_SR | VGA_SEQ_RESET_AR); - - /* Unlock CRTC registers 0-7 */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_END_HORZ_BLANKING_REG); - IOWriteB(VGA_CRTC_DATA, IOReadB(VGA_CRTC_DATA) | 0x80); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_VERT_RETRACE_END_REG); - IOWriteB(VGA_CRTC_DATA, IOReadB(VGA_CRTC_DATA) & ~0x80); - // Make sure they remain unlocked - Registers->CRT[VGA_CRTC_END_HORZ_BLANKING_REG] |= 0x80; - Registers->CRT[VGA_CRTC_VERT_RETRACE_END_REG] &= ~0x80; - - /* Write the CRTC registers */ - for (i = 0; i < VGA_CRTC_MAX_REG; i++) - { - IOWriteB(VGA_CRTC_INDEX, i); - IOWriteB(VGA_CRTC_DATA, Registers->CRT[i]); - } - - /* Write the GC registers */ - for (i = 0; i < VGA_GC_MAX_REG; i++) - { - IOWriteB(VGA_GC_INDEX, i); - IOWriteB(VGA_GC_DATA, Registers->Graphics[i]); - } - - /* Write the AC registers */ - // DbgPrint("\n"); - for (i = 0; i < VGA_AC_MAX_REG; i++) - { - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, i); - IOWriteB(VGA_AC_WRITE, Registers->Attribute[i]); - // DbgPrint("Registers->Attribute[%d] = %d\n", i, Registers->Attribute[i]); - } - // DbgPrint("\n"); - - /* Set the PEL mask */ - IOWriteB(VGA_DAC_MASK, 0xFF); - - /* Enable screen and disable palette access */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, 0x20); - - /* Enable interrupts */ - setIF(1); - - return TRUE; -} - -static VOID VgaSetPalette(const COLORREF* Palette, ULONG Size) -{ - ULONG i; - - // /* Disable screen and enable palette access */ - // IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - // IOWriteB(VGA_AC_INDEX, 0x00); - - for (i = 0; i < Size; i++) - { - IOWriteB(VGA_DAC_WRITE_INDEX, i); - IOWriteB(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetRValue(Palette[i]))); - IOWriteB(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetGValue(Palette[i]))); - IOWriteB(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetBValue(Palette[i]))); - } - - /* The following step might be optional */ - for (i = Size; i < VGA_MAX_COLORS; i++) - { - IOWriteB(VGA_DAC_WRITE_INDEX, i); - IOWriteB(VGA_DAC_DATA, VGA_COLOR_TO_DAC(0x00)); - IOWriteB(VGA_DAC_DATA, VGA_COLOR_TO_DAC(0x00)); - IOWriteB(VGA_DAC_DATA, VGA_COLOR_TO_DAC(0x00)); - } - - /* Enable screen and disable palette access */ - // IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - // IOWriteB(VGA_AC_INDEX, 0x20); -} - -static VOID VgaChangePalette(BYTE ModeNumber) -{ - const COLORREF* Palette; - ULONG Size; - - if (ModeNumber >= 0x13) - { - /* VGA modes */ - Palette = VgaPalette; - Size = sizeof(VgaPalette)/sizeof(VgaPalette[0]); - } - else if (ModeNumber == 0x10) - { - /* EGA HiRes mode */ - Palette = EgaPalette__HiRes; - Size = sizeof(EgaPalette__HiRes)/sizeof(EgaPalette__HiRes[0]); - } - else // if ((ModeNumber == 0x0D) || (ModeNumber == 0x0E)) - { - /* EGA modes */ - Palette = EgaPalette___16ColorFixed_DOSBox; - Size = sizeof(EgaPalette___16ColorFixed_DOSBox)/sizeof(EgaPalette___16ColorFixed_DOSBox[0]); - } - - VgaSetPalette(Palette, Size); -} - -static VOID VgaGetCursorPosition(PBYTE Row, PBYTE Column) -{ - SHORT ScreenColumns = VgaGetDisplayResolution().X; - BYTE OffsetLow, OffsetHigh; - WORD Offset; - - /* Get the cursor location */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); - OffsetLow = IOReadB(VGA_CRTC_DATA); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); - OffsetHigh = IOReadB(VGA_CRTC_DATA); - - Offset = MAKEWORD(OffsetLow, OffsetHigh); - - *Row = (BYTE)(Offset / ScreenColumns); - *Column = (BYTE)(Offset % ScreenColumns); -} - -static VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) -{ - /* Make sure the selected video page is valid */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Get the cursor location */ - *Row = HIBYTE(Bda->CursorPosition[Page]); - *Column = LOBYTE(Bda->CursorPosition[Page]); -} - -static VOID VidBiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page) -{ - /* Make sure the selected video page is valid */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Update the position in the BDA */ - Bda->CursorPosition[Page] = MAKEWORD(Column, Row); - - /* Check if this is the current video page */ - if (Page == Bda->VideoPage) - { - WORD Offset = Row * Bda->ScreenColumns + Column; - - /* Modify the CRTC registers */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); - IOWriteB(VGA_CRTC_DATA , LOBYTE(Offset)); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); - IOWriteB(VGA_CRTC_DATA , HIBYTE(Offset)); - } -} - -BYTE VidBiosGetVideoMode(VOID) -{ - return Bda->VideoMode; -} - -static BOOLEAN VidBiosSetVideoMode(BYTE ModeNumber) -{ - BYTE Page; - - COORD Resolution; - PVGA_REGISTERS VgaMode = VideoModes[ModeNumber]; - - DPRINT1("Switching to mode %Xh; VgaMode = 0x%p\n", ModeNumber, VgaMode); - - if (!VgaSetRegisters(VgaMode)) return FALSE; - - VgaChangePalette(ModeNumber); - - /* - * IBM standard modes do not clear the screen if the - * high bit of AL is set (EGA or higher only). - * See Ralf Brown: http://www.ctyme.com/intr/rb-0069.htm - * for more information. - */ - // if ((ModeNumber & 0x08) == 0) VgaClearMemory(); - VgaClearMemory(); - - // Bda->CrtModeControl; - // Bda->CrtColorPaletteMask; - // Bda->EGAFlags; - // Bda->VGAFlags; - - /* Update the values in the BDA */ - Bda->VideoMode = ModeNumber; - Bda->VideoPageSize = VideoModePageSize[ModeNumber]; - Bda->VideoPage = 0; - Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; - - /* Set the start address in the CRTC */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); - IOWriteB(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_HIGH_REG); - IOWriteB(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); - - /* Update the character height */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_MAX_SCAN_LINE_REG); - Bda->CharacterHeight = 1 + (IOReadB(VGA_CRTC_DATA) & 0x1F); - - /* Update the screen size */ - Resolution = VgaGetDisplayResolution(); - Bda->ScreenColumns = Resolution.X; - Bda->ScreenRows = Resolution.Y - 1; - - /* Set the cursor position for each page */ - for (Page = 0; Page < BIOS_MAX_PAGES; ++Page) - VidBiosSetCursorPosition(0, 0, Page); - - /* Refresh display */ - VgaRefreshDisplay(); - - return TRUE; -} - -static BOOLEAN VidBiosSetVideoPage(BYTE PageNumber) -{ - BYTE Row, Column; - - /* Check if the page exists */ - if (PageNumber >= BIOS_MAX_PAGES) return FALSE; - - /* Check if this is the same page */ - if (PageNumber == Bda->VideoPage) return TRUE; - - /* Update the values in the BDA */ - Bda->VideoPage = PageNumber; - Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; - - /* Set the start address in the CRTC */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); - IOWriteB(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_HIGH_REG); - IOWriteB(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); - - /* - * Get the cursor location (we don't update anything on the BIOS side - * but we update the cursor location on the VGA side). - */ - VidBiosGetCursorPosition(&Row, &Column, PageNumber); - VidBiosSetCursorPosition(Row, Column, PageNumber); - - return TRUE; -} - -static VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) -{ - WORD CharData = MAKEWORD(Character, Attribute); - BYTE Row, Column; - - /* Make sure the page exists */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Get the cursor location */ - VidBiosGetCursorPosition(&Row, &Column, Page); - - if (Character == '\a') - { - /* Bell control character */ - // NOTE: We may use what the terminal emulator offers to us... - Beep(800, 200); - return; - } - else if (Character == '\b') - { - /* Backspace control character */ - if (Column > 0) - { - Column--; - } - else if (Row > 0) - { - Column = Bda->ScreenColumns - 1; - Row--; - } - - /* Erase the existing character */ - CharData = MAKEWORD(' ', Attribute); - EmulatorWriteMemory(&EmulatorContext, - TO_LINEAR(TEXT_VIDEO_SEG, - Page * Bda->VideoPageSize + - (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), - (LPVOID)&CharData, - sizeof(WORD)); - } - else if (Character == '\t') - { - /* Horizontal Tabulation control character */ - do - { - // Taken from DOSBox - VidBiosPrintCharacter(' ', Attribute, Page); - VidBiosGetCursorPosition(&Row, &Column, Page); - } while (Column % 8); - } - else if (Character == '\n') - { - /* Line Feed control character */ - Row++; - } - else if (Character == '\r') - { - /* Carriage Return control character */ - Column = 0; - } - else - { - /* Default character */ - - /* Write the character */ - EmulatorWriteMemory(&EmulatorContext, - TO_LINEAR(TEXT_VIDEO_SEG, - Page * Bda->VideoPageSize + - (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), - (LPVOID)&CharData, - sizeof(WORD)); - - /* Advance the cursor */ - Column++; - } - - /* Check if it passed the end of the row */ - if (Column >= Bda->ScreenColumns) - { - /* Return to the first column and go to the next line */ - Column = 0; - Row++; - } - - /* Scroll the screen up if needed */ - if (Row > Bda->ScreenRows) - { - /* The screen must be scrolled up */ - SMALL_RECT Rectangle = { 0, 0, Bda->ScreenColumns - 1, Bda->ScreenRows }; - - VidBiosScrollWindow(SCROLL_DIRECTION_UP, - 1, - Rectangle, - Page, - DEFAULT_ATTRIBUTE); - - Row--; - } - - /* Set the cursor position */ - VidBiosSetCursorPosition(Row, Column, Page); -} - -static VOID WINAPI VidBiosVideoService(LPWORD Stack) -{ - switch (getAH()) - { - /* Set Video Mode */ - case 0x00: - { - VidBiosSetVideoMode(getAL()); - break; - } - - /* Set Text-Mode Cursor Shape */ - case 0x01: - { - /* Update the BDA */ - Bda->CursorStartLine = getCH(); - Bda->CursorEndLine = getCL(); - - /* Modify the CRTC registers */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_START_REG); - IOWriteB(VGA_CRTC_DATA , Bda->CursorStartLine); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_END_REG); - IOWriteB(VGA_CRTC_DATA , Bda->CursorEndLine); - - break; - } - - /* Set Cursor Position */ - case 0x02: - { - VidBiosSetCursorPosition(getDH(), getDL(), getBH()); - break; - } - - /* Get Cursor Position and Shape */ - case 0x03: - { - /* Make sure the selected video page exists */ - if (getBH() >= BIOS_MAX_PAGES) break; - - /* Return the result */ - setAX(0); - setCX(MAKEWORD(Bda->CursorEndLine, Bda->CursorStartLine)); - setDX(Bda->CursorPosition[getBH()]); - break; - } - - /* Query Light Pen */ - case 0x04: - { - /* - * On modern BIOSes, this function returns 0 - * so that we can ignore the other registers. - */ - setAX(0); - break; - } - - /* Select Active Display Page */ - case 0x05: - { - VidBiosSetVideoPage(getAL()); - break; - } - - /* Scroll Window Up/Down */ - case 0x06: - case 0x07: - { - SMALL_RECT Rectangle = { getCL(), getCH(), getDL(), getDH() }; - - /* Call the internal function */ - VidBiosScrollWindow((getAH() == 0x06) ? SCROLL_DIRECTION_UP - : SCROLL_DIRECTION_DOWN, - getAL(), - Rectangle, - Bda->VideoPage, - getBH()); - - break; - } - - /* Read Character and Attribute at Cursor Position */ - case 0x08: - { - WORD CharacterData; - BYTE Page = getBH(); - DWORD Offset; - - /* Check if the page exists */ - if (Page >= BIOS_MAX_PAGES) break; - - /* Find the offset of the character */ - Offset = Page * Bda->VideoPageSize + - (HIBYTE(Bda->CursorPosition[Page]) * Bda->ScreenColumns + - LOBYTE(Bda->CursorPosition[Page])) * 2; - - /* Read from the video memory */ - EmulatorReadMemory(&EmulatorContext, - TO_LINEAR(TEXT_VIDEO_SEG, Offset), - (LPVOID)&CharacterData, - sizeof(WORD)); - - /* Return the character data in AX */ - setAX(CharacterData); - - break; - } - - /* Write Character and Attribute at Cursor Position */ - case 0x09: - /* Write Character only (PCjr: + Attribute) at Cursor Position */ - case 0x0A: - { - WORD CharacterData = MAKEWORD(getAL(), getBL()); - BYTE Page = getBH(); - DWORD Offset, Counter = getCX(); - - /* Check if the page exists */ - if (Page >= BIOS_MAX_PAGES) break; - - /* Find the offset of the character */ - Offset = Page * Bda->VideoPageSize + - (HIBYTE(Bda->CursorPosition[Page]) * Bda->ScreenColumns + - LOBYTE(Bda->CursorPosition[Page])) * 2; - - /* Write to video memory a certain number of times */ - while (Counter > 0) - { - EmulatorWriteMemory(&EmulatorContext, - TO_LINEAR(TEXT_VIDEO_SEG, Offset), - (LPVOID)&CharacterData, - (getAH() == 0x09) ? sizeof(WORD) : sizeof(BYTE)); - Offset += 2; - Counter--; - } - - break; - } - - /* Teletype Output */ - case 0x0E: - { - VidBiosPrintCharacter(getAL(), getBL(), getBH()); - break; - } - - /* Get Current Video Mode */ - case 0x0F: - { - setAX(MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); - setBX(MAKEWORD(getBL(), Bda->VideoPage)); - break; - } - - /* Palette Control */ - case 0x10: - { - switch (getAL()) - { - /* Set Single Palette Register */ - case 0x00: - { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, getBL()); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, getBH()); - - /* Enable screen and disable palette access */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, 0x20); - break; - } - - /* Set Overscan Color */ - case 0x01: - { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, getBH()); - - /* Enable screen and disable palette access */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, 0x20); - break; - } - - /* Set All Palette Registers */ - case 0x02: - { - INT i; - LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); - - /* Set the palette registers */ - for (i = 0; i <= VGA_AC_PAL_F_REG; i++) - { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, i); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, Buffer[i]); - } - - /* Set the overscan register */ - IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); - IOWriteB(VGA_AC_WRITE, Buffer[VGA_AC_PAL_F_REG + 1]); - - /* Enable screen and disable palette access */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, 0x20); - break; - } - - /* Get Single Palette Register */ - case 0x07: - { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, getBL()); - - /* Read the data */ - setBH(IOReadB(VGA_AC_READ)); - - /* Enable screen and disable palette access */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, 0x20); - break; - } - - /* Get Overscan Color */ - case 0x08: - { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); - - /* Read the data */ - setBH(IOReadB(VGA_AC_READ)); - - /* Enable screen and disable palette access */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, 0x20); - break; - } - - /* Get All Palette Registers */ - case 0x09: - { - INT i; - LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); - - /* Get the palette registers */ - for (i = 0; i <= VGA_AC_PAL_F_REG; i++) - { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, i); - - /* Read the data */ - Buffer[i] = IOReadB(VGA_AC_READ); - } - - /* Get the overscan register */ - IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); - Buffer[VGA_AC_PAL_F_REG + 1] = IOReadB(VGA_AC_READ); - - /* Enable screen and disable palette access */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, 0x20); - break; - } - - /* Set Individual DAC Register */ - case 0x10: - { - /* Write the index */ - // Certainly in BL and not in BX as said by Ralf Brown... - IOWriteB(VGA_DAC_WRITE_INDEX, getBL()); - - /* Write the data in this order: Red, Green, Blue */ - IOWriteB(VGA_DAC_DATA, getDH()); - IOWriteB(VGA_DAC_DATA, getCH()); - IOWriteB(VGA_DAC_DATA, getCL()); - - break; - } - - /* Set Block of DAC Registers */ - case 0x12: - { - INT i; - LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); - - /* Write the index */ - // Certainly in BL and not in BX as said by Ralf Brown... - IOWriteB(VGA_DAC_WRITE_INDEX, getBL()); - - for (i = 0; i < getCX(); i++) - { - /* Write the data in this order: Red, Green, Blue */ - IOWriteB(VGA_DAC_DATA, *Buffer++); - IOWriteB(VGA_DAC_DATA, *Buffer++); - IOWriteB(VGA_DAC_DATA, *Buffer++); - } - - break; - } - - /* Get Individual DAC Register */ - case 0x15: - { - /* Write the index */ - IOWriteB(VGA_DAC_READ_INDEX, getBL()); - - /* Read the data in this order: Red, Green, Blue */ - setDH(IOReadB(VGA_DAC_DATA)); - setCH(IOReadB(VGA_DAC_DATA)); - setCL(IOReadB(VGA_DAC_DATA)); - - break; - } - - /* Get Block of DAC Registers */ - case 0x17: - { - INT i; - LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); - - /* Write the index */ - // Certainly in BL and not in BX as said by Ralf Brown... - IOWriteB(VGA_DAC_READ_INDEX, getBL()); - - for (i = 0; i < getCX(); i++) - { - /* Write the data in this order: Red, Green, Blue */ - *Buffer++ = IOReadB(VGA_DAC_DATA); - *Buffer++ = IOReadB(VGA_DAC_DATA); - *Buffer++ = IOReadB(VGA_DAC_DATA); - } - - break; - } - - default: - { - DPRINT1("BIOS Palette Control Sub-command AL = 0x%02X NOT IMPLEMENTED\n", - getAL()); - break; - } - } - - break; - } - - /* Alternate Function Select */ - case 0x12: - { - DPRINT1("BIOS Function INT 12h (Alternate Function Select), BX = 0x%04X NOT IMPLEMENTED\n", - getBX()); - break; - } - - /* Write String */ - case 0x13: - { - DPRINT1("BIOS Function INT 13h (Write String) is UNIMPLEMENTED\n"); - break; - } - - /* Display combination code */ - case 0x1A: - { - switch(getAL()) - { - case 0x00: /* Get Display combiantion code */ - setAX(MAKEWORD(0x1A, 0x1A)); - setBX(MAKEWORD(0x08, 0x00)); /* VGA w/ color analog display */ - break; - case 0x01: /* Set Display combination code */ - DPRINT1("Set Display combination code - Unsupported\n"); - break; - default: - break; - } - break; - } - - default: - { - DPRINT1("BIOS Function INT 10h, AH = 0x%02X NOT IMPLEMENTED\n", - getAH()); - } - } -} +#include "vidbios32.h" +#include "../vidbios.h" +#include "bios32p.h" /* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN VidBios32Initialize(VOID) { - BYTE Row, Column; - - /* Some interrupts are in fact addresses to tables */ - ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x1F] = (ULONG)NULL; - // ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x43] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; - - /* Set the default video mode */ - VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); - - /* Update cursor position */ - VgaGetCursorPosition(&Row, &Column); - VidBiosSetCursorPosition(Row, Column, Bda->VideoPage); + /* Initialize the common Video BIOS Support Library */ + if (!VidBiosInitialize()) return FALSE; /* Register the BIOS 32-bit Interrupts */ RegisterBiosInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); @@ -1547,6 +34,8 @@ VOID VidBios32Cleanup(VOID) { + /* Cleanup the common Video BIOS Support Library */ + VidBiosCleanup(); } /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -3,7 +3,9 @@ * PROJECT: ReactOS Virtual DOS Machine * FILE: vidbios32.h * PURPOSE: VDM Video 32-bit BIOS - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * NOTE: All of the real code is in bios/vidbios.c */ #ifndef _VIDBIOS32_H_ @@ -15,24 +17,7 @@ /* DEFINES ********************************************************************/ -#define BIOS_VIDEO_INTERRUPT 0x10 - -#define CONSOLE_FONT_HEIGHT 8 -#define BIOS_DEFAULT_VIDEO_MODE 0x03 -#define BIOS_MAX_PAGES 8 -#define BIOS_MAX_VIDEO_MODE 0x13 -#define DEFAULT_ATTRIBUTE 0x07 - -#define GRAPHICS_VIDEO_SEG 0xA000 -#define TEXT_VIDEO_SEG 0xB800 - -enum -{ - SCROLL_DIRECTION_UP, - SCROLL_DIRECTION_DOWN, - SCROLL_DIRECTION_LEFT, - SCROLL_DIRECTION_RIGHT -}; +// #define BIOS_VIDEO_INTERRUPT 0x10 /* FUNCTIONS ******************************************************************/ Added: branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/kbd… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c (added) +++ branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -0,0 +1,51 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: kbdbios.c + * PURPOSE: VDM Keyboard BIOS Support Library + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" +#include "callback.h" +#include "bop.h" + +#include "bios.h" +// #include "kbdbios.h" + +/* DEFINES ********************************************************************/ + +/* BOP Identifiers */ +#define BOP_KBD_IRQ 0x09 +#define BOP_KBD_INT 0x16 + +/* PUBLIC FUNCTIONS ***********************************************************/ + +static VOID WINAPI KbdBiosIRQ(LPWORD Stack) +{ + DPRINT1("KbdBiosIRQ is UNIMPLEMENTED\n"); +} + +static VOID WINAPI KbdBiosINT(LPWORD Stack) +{ + DPRINT1("KbdBiosINT is UNIMPLEMENTED\n"); +} + +BOOLEAN KbdBiosInitialize(VOID) +{ + /* Register the BIOS support BOPs */ + RegisterBop(BOP_KBD_IRQ, KbdBiosIRQ); + RegisterBop(BOP_KBD_INT, KbdBiosINT); + + return TRUE; +} + +VOID KbdBiosCleanup(VOID) +{ +} + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/kbd… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h (added) +++ branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: kbdbios.h + * PURPOSE: VDM Keyboard BIOS Support Library + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _KBDBIOS_H_ +#define _KBDBIOS_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +#define BIOS_KBD_INTERRUPT 0x16 + +#define BIOS_KBD_BUFFER_SIZE 16 + +/* FUNCTIONS ******************************************************************/ + +WORD BiosGetCharacter(VOID); + +BOOLEAN KbdBiosInitialize(VOID); +VOID KbdBiosCleanup(VOID); + +#endif // _KBDBIOS_H_ + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h ------------------------------------------------------------------------------ svn:eol-style = native Copied: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c (from r62381, branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -1,9 +1,10 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: vidbios32.c - * PURPOSE: VDM Video 32-bit BIOS + * FILE: vidbios.c + * PURPOSE: VDM Video BIOS Support Library * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ @@ -12,12 +13,18 @@ #include "emulator.h" #include "callback.h" - -// #include "vidbios32.h" -#include "bios32.h" +#include "bop.h" + +#include "bios.h" +// #include "vidbios.h" #include "io.h" #include "hardware/vga.h" + +/* DEFINES ********************************************************************/ + +/* BOP Identifiers */ +#define BOP_VIDEO_INT 0x10 /* MACROS *********************************************************************/ @@ -1118,7 +1125,9 @@ VidBiosSetCursorPosition(Row, Column, Page); } -static VOID WINAPI VidBiosVideoService(LPWORD Stack) +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID WINAPI VidBiosVideoService(LPWORD Stack) { switch (getAH()) { @@ -1519,9 +1528,7 @@ } } -/* PUBLIC FUNCTIONS ***********************************************************/ - -BOOLEAN VidBios32Initialize(VOID) +BOOLEAN VidBiosInitialize(VOID) { BYTE Row, Column; @@ -1539,13 +1546,13 @@ VgaGetCursorPosition(&Row, &Column); VidBiosSetCursorPosition(Row, Column, Bda->VideoPage); - /* Register the BIOS 32-bit Interrupts */ - RegisterBiosInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); + /* Register the BIOS support BOPs */ + RegisterBop(BOP_VIDEO_INT, VidBiosVideoService); return TRUE; } -VOID VidBios32Cleanup(VOID) +VOID VidBiosCleanup(VOID) { } Copied: branches/ntvdm/subsystems/ntvdm/bios/vidbios.h (from r62377, branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/vidbios.h [iso-8859-1] Sun Mar 2 22:50:31 2014 @@ -1,13 +1,14 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: vidbios32.h - * PURPOSE: VDM Video 32-bit BIOS + * FILE: vidbios.h + * PURPOSE: VDM Video BIOS Support Library * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#ifndef _VIDBIOS32_H_ -#define _VIDBIOS32_H_ +#ifndef _VIDBIOS_H_ +#define _VIDBIOS_H_ /* INCLUDES *******************************************************************/ @@ -36,9 +37,11 @@ /* FUNCTIONS ******************************************************************/ -BOOLEAN VidBios32Initialize(VOID); -VOID VidBios32Cleanup(VOID); +VOID WINAPI VidBiosVideoService(LPWORD Stack); -#endif // _VIDBIOS32_H_ +BOOLEAN VidBiosInitialize(VOID); +VOID VidBiosCleanup(VOID); + +#endif // _VIDBIOS_H_ /* EOF */

10 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2014