Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[dquintana] 62475: [RSHELL] * Workaround for the exec issue. Ros currently seems to send a bogus WM_ACTIVATE message when clicking while the window is already active. Proper fix may come later if I...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Mar 11 17:40:18 2014 New Revision: 62475 URL: http://svn.reactos.org/svn/reactos?rev=62475&view=rev Log: [RSHELL] * Workaround for the exec issue. Ros currently seems to send a bogus WM_ACTIVATE message when clicking while the window is already active. Proper fix may come later if I can figure out why this happens. CORE-7586 Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Tue Mar 11 17:40:18 2014 @@ -2610,7 +2610,7 @@ } if (This->TrayBandSite == NULL || - !SUCCEEDED(ITrayBandSite_ProcessMessage(This->TrayBandSite, + FAILED(ITrayBandSite_ProcessMessage(This->TrayBandSite, hwnd, uMsg, wParam, 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] Tue Mar 11 17:40:18 2014 @@ -491,7 +491,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE); return UIActivateIO(FALSE, NULL); } @@ -609,8 +609,13 @@ LRESULT CMenuDeskBar::_OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - if (wParam != 0) + DbgPrint("BaseBar %08p (de)activated (%08x, %08x).\n", m_hWnd, wParam, lParam); + + // BUG in ReactOS: WM_ACTIVATE/WA_INACTIVE makes no sense with lParam==hWnd + if (LOWORD(wParam) != 0 || reinterpret_cast<HWND>(lParam) == m_hWnd) + { return 0; + } // HACK! I just want it to work !!! CComPtr<IDeskBar> db; 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] Tue Mar 11 17:40:18 2014 @@ -622,7 +622,10 @@ PopupItem(wParam); return S_FALSE; } - return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); + HRESULT hr = m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return S_OK; // filter out a possible S_FALSE from here. } HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType) @@ -938,7 +941,10 @@ // in case the clicked item has a submenu, we do not need to execute the item if (hr == S_FALSE) - return hr; + { + DbgPrint("CMenuToolbarBase::OnCommand told us to cancel.\n"); + return hr; + } return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); } @@ -1102,7 +1108,10 @@ // in case the clicked item has a submenu, we do not need to execute the item if (hr == S_FALSE) - return hr; + { + DbgPrint("CMenuToolbarBase::OnCommand told us to cancel.\n"); + return hr; + } DWORD_PTR data; GetDataFromId(wParam, NULL, &data); 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] Tue Mar 11 17:40:18 2014 @@ -267,8 +267,10 @@ case SMC_GETOBJECT: return OnGetObject(psmd, *reinterpret_cast<IID *>(wParam), reinterpret_cast<void **>(lParam)); case SMC_EXEC: + DbgPrint("SMC_EXEC\n"); return OnExec(psmd); case SMC_SFEXEC: + DbgPrint("SMC_SFEXEC\n"); m_pTrayPriv->Execute(psmd->psf, psmd->pidlItem); break; }

10 years, 6 months

[akhaldi] 62474: [SHELL32_APITEST] * Plug some leaks. CIDs 1106362, 1106363 and 1106364. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 11 13:06:09 2014 New Revision: 62474 URL: http://svn.reactos.org/svn/reactos?rev=62474&view=rev Log: [SHELL32_APITEST] * Plug some leaks. CIDs 1106362, 1106363 and 1106364. CORE-7975 Modified: trunk/rostests/apitests/shell32/menu.cpp Modified: trunk/rostests/apitests/shell32/menu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/menu.cpp… ============================================================================== --- trunk/rostests/apitests/shell32/menu.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/menu.cpp [iso-8859-1] Tue Mar 11 13:06:09 2014 @@ -11,7 +11,11 @@ { ULONG size = (wcslen(className) + 1)* sizeof(WCHAR); PWCHAR buffer = (PWCHAR)malloc(size); - if (GetClassNameW(hwnd, buffer, size ) == 0) return FALSE; + if (GetClassNameW(hwnd, buffer, size ) == 0) + { + free(buffer); + return FALSE; + } int res = wcscmp(buffer, className); free(buffer); return res == 0; @@ -161,6 +165,7 @@ if (!CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite)) { skip("failed to create CShellMenuObject\n"); + delete dummyWindow; return; } @@ -288,6 +293,7 @@ if (!CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite)) { skip("failed to create CShellMenuObject\n"); + delete dummyWindow; return; }

10 years, 6 months

[gedmurphy] 62473: [NTOSKRNL] - Fix the buffer size check / set

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Mar 11 10:53:06 2014 New Revision: 62473 URL: http://svn.reactos.org/svn/reactos?rev=62473&view=rev Log: [NTOSKRNL] - Fix the buffer size check / set Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Tue Mar 11 10:53:06 2014 @@ -1434,7 +1434,7 @@ } /* Validate buffer length (we do not copy the name!) */ - *ResultLength = sizeof(KeyCachedInfo); + *ResultLength = sizeof(*KeyCachedInfo); if (Length < *ResultLength) { return STATUS_BUFFER_TOO_SMALL;

10 years, 6 months

[dquintana] 62472: [RSHELL] * Fix reusing the same toolbar when SetMenu is called multiple times. * Avoid some null dereferences. [BROWSEUI] * Temporarily (?) disable the logo band. The browser win...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Mar 11 10:42:25 2014 New Revision: 62472 URL: http://svn.reactos.org/svn/reactos?rev=62472&view=rev Log: [RSHELL] * Fix reusing the same toolbar when SetMenu is called multiple times. * Avoid some null dereferences. [BROWSEUI] * Temporarily (?) disable the logo band. The browser window's "coolbar" and menubar now display and work properly in both Windows and ReactOS. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.h branches/shell-experiments/dll/win32/browseui/precomp.h branches/shell-experiments/dll/win32/browseui/shellbrowser.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] Tue Mar 11 10:42:25 2014 @@ -28,6 +28,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); +#undef UNIMPLEMENTED + +#define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__) + extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv) { @@ -121,9 +125,14 @@ HWND hwnd, DWORD dwFlags) { + DbgPrint("CMenuBand::SetMenu called, hmenu=%p; hwnd=%p, flags=%x\n", hmenu, hwnd, dwFlags); + + BOOL created = FALSE; + if (m_staticToolbar == NULL) { m_staticToolbar = new CMenuStaticToolbar(this); + created = true; } m_hmenu = hmenu; m_menuOwner = hwnd; @@ -140,11 +149,18 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = m_staticToolbar->FillToolbar(); + if (created) + { + hr = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = m_staticToolbar->FillToolbar(); + } + else + { + hr = m_staticToolbar->FillToolbar(TRUE); + } } return hr; @@ -206,7 +222,7 @@ } hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent)); - if (FAILED(hr) && hr != E_NOINTERFACE) + if (hr != E_NOINTERFACE && FAILED_UNEXPECTEDLY(hr)) return hr; CComPtr<IOleWindow> pTopLevelWindow; @@ -303,6 +319,8 @@ if (m_staticToolbar == NULL && m_SFToolbar == NULL) return E_FAIL; + pdbi->ptMinSize.x = max(sizeStatic.cx, sizeShlFld.cx) + 20; + pdbi->ptMinSize.y = sizeStatic.cy + sizeShlFld.cy; pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx) + 20; pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; @@ -368,9 +386,12 @@ { HRESULT hr; - hr = m_subMenuParent->SetSubMenu(this, fActivate); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (m_subMenuParent) + { + hr = m_subMenuParent->SetSubMenu(this, fActivate); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } if (fActivate) { @@ -436,18 +457,26 @@ switch (dwSelectType) { case MPOS_CHILDTRACKING: + if (!m_subMenuParent) + break; // TODO: Cancel timers? return m_subMenuParent->OnSelect(dwSelectType); case MPOS_SELECTLEFT: if (m_subMenuChild) m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); + if (!m_subMenuParent) + break; return m_subMenuParent->OnSelect(dwSelectType); case MPOS_SELECTRIGHT: + if (!m_subMenuParent) + break; return m_subMenuParent->OnSelect(dwSelectType); case MPOS_EXECUTE: case MPOS_FULLCANCEL: if (m_subMenuChild) m_subMenuChild->OnSelect(dwSelectType); + if (!m_subMenuParent) + break; return m_subMenuParent->OnSelect(dwSelectType); case MPOS_CANCELLEVEL: if (m_subMenuChild) @@ -620,24 +649,17 @@ HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y, RECT& rcExclude) { - HWND sendTo = m_menuOwner; - TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude }; UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; - if (sendTo) - { - ::TrackPopupMenuEx(popup, flags, x, y, sendTo, &params); + if (m_menuOwner) + { + ::TrackPopupMenuEx(popup, flags, x, y, m_menuOwner, &params); } else { - // FIXME: Windows uses the top-level window when calling TrackPopupMenuEx, - // but this is probably not the means by which it obtains that HWND. - // Meanwhile, this works. - GetWindow(&sendTo); - sendTo = GetAncestor(sendTo, GA_ROOT); - ::TrackPopupMenuEx(popup, flags, x, y, sendTo, &params); + ::TrackPopupMenuEx(popup, flags, x, y, m_topLevelWindow, &params); } return S_OK; @@ -720,6 +742,8 @@ { if (m_subMenuChild) m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); + if (!m_subMenuParent) + return S_OK; return m_subMenuParent->OnSelect(MPOS_CANCELLEVEL); } else if (changeType == MPOS_SELECTRIGHT) @@ -732,10 +756,14 @@ return S_FALSE; } } + if (!m_subMenuParent) + return S_OK; return m_subMenuParent->OnSelect(changeType); } else { + if (!m_subMenuParent) + return S_OK; return m_subMenuParent->OnSelect(changeType); } return S_OK; @@ -754,7 +782,10 @@ m_subMenuChild = popup; if (popup) { - IUnknown_SetSite(popup, m_subMenuParent); + if (m_subMenuParent) + IUnknown_SetSite(popup, m_subMenuParent); + else + IUnknown_SetSite(popup, m_site); popup->Popup(pAt, pExclude, MPPF_RIGHT); } 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] Tue Mar 11 10:42:25 2014 @@ -42,20 +42,9 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - RECT rc; - HDC hdc; - HBRUSH bgBrush; - HBRUSH hotBrush; NMHDR * hdr; - NMTBCUSTOMDRAW * cdraw; - NMTBHOTITEM * hot; - NMMOUSE * rclick; NMPGCALCSIZE* csize; - TBBUTTONINFO btni; - COLORREF clrText; - COLORREF clrTextHighlight; SIZE tbs; - bool isHot, isPopup; *theResult = 0; switch (uMsg) @@ -70,6 +59,9 @@ case TTN_GETDISPINFOA: case TTN_GETDISPINFOW: return S_OK; + + case TBN_DELETINGBUTTON: + return OnDeletingButton(reinterpret_cast<LPNMTOOLBAR>(hdr)); case PGN_CALCSIZE: csize = reinterpret_cast<LPNMPGCALCSIZE>(hdr); @@ -90,83 +82,17 @@ return OnCommand(wParam, 0, theResult); case TBN_HOTITEMCHANGE: - hot = reinterpret_cast<LPNMTBHOTITEM>(hdr); - return OnHotItemChange(hot); + return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr)); case NM_RCLICK: - rclick = reinterpret_cast<LPNMMOUSE>(hdr); - - return OnContextMenu(rclick); + return OnContextMenu(reinterpret_cast<LPNMMOUSE>(hdr)); case NM_CUSTOMDRAW: - cdraw = reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr); - switch (cdraw->nmcd.dwDrawStage) - { - case CDDS_PREPAINT: - if (m_toolbarFlags & SMINIT_VERTICAL) - *theResult = CDRF_NOTIFYITEMDRAW; - return S_OK; - - case CDDS_ITEMPREPAINT: - - clrText = GetSysColor(COLOR_MENUTEXT); - clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); - - bgBrush = GetSysColorBrush(COLOR_MENU); - hotBrush = GetSysColorBrush(m_useFlatMenus ? COLOR_MENUHILIGHT : COLOR_HIGHLIGHT); - - rc = cdraw->nmcd.rc; - hdc = cdraw->nmcd.hdc; - - isHot = m_hotBar == this && m_hotItem == static_cast<INT>(cdraw->nmcd.dwItemSpec); - isPopup = m_popupBar == this && m_popupItem == static_cast<INT>(cdraw->nmcd.dwItemSpec); - - if (isHot || (m_hotItem < 0 && isPopup)) - { - cdraw->nmcd.uItemState |= CDIS_HOT; - } - else - { - cdraw->nmcd.uItemState &= ~CDIS_HOT; - } - - if (cdraw->nmcd.uItemState&CDIS_HOT) - { - FillRect(hdc, &rc, hotBrush); - SetTextColor(hdc, clrTextHighlight); - cdraw->clrText = clrTextHighlight; - } - else - { - FillRect(hdc, &rc, bgBrush); - SetTextColor(hdc, clrText); - cdraw->clrText = clrText; - } - - cdraw->iListGap += 4; - - *theResult = CDRF_NOTIFYPOSTPAINT | TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOOFFSET | TBCDRF_NOMARK | 0x00800000; // FIXME: the last bit is Vista+, for debugging only - return S_OK; - - case CDDS_ITEMPOSTPAINT: - btni.cbSize = sizeof(btni); - btni.dwMask = TBIF_STYLE; - SendMessage(hWnd, TB_GETBUTTONINFO, cdraw->nmcd.dwItemSpec, reinterpret_cast<LPARAM>(&btni)); - if (btni.fsStyle & BTNS_DROPDOWN) - { - SelectObject(cdraw->nmcd.hdc, m_marlett); - WCHAR text[] = L"8"; - SetBkMode(cdraw->nmcd.hdc, TRANSPARENT); - RECT rc = cdraw->nmcd.rc; - rc.right += 1; - DrawTextEx(cdraw->nmcd.hdc, text, 1, &rc, DT_NOCLIP | DT_VCENTER | DT_RIGHT | DT_SINGLELINE, NULL); - } - *theResult = TRUE; - return S_OK; - } - return S_OK; + return OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), theResult); + case RBN_CHILDSIZE: return S_OK; + default: DbgPrint("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom); } @@ -174,6 +100,84 @@ } return S_FALSE; +} + +HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult) +{ + RECT rc; + HDC hdc; + HBRUSH bgBrush; + HBRUSH hotBrush; + COLORREF clrText; + COLORREF clrTextHighlight; + bool isHot, isPopup; + TBBUTTONINFO btni; + + switch (cdraw->nmcd.dwDrawStage) + { + case CDDS_PREPAINT: + if (m_toolbarFlags & SMINIT_VERTICAL) + *theResult = CDRF_NOTIFYITEMDRAW; + return S_OK; + + case CDDS_ITEMPREPAINT: + + clrText = GetSysColor(COLOR_MENUTEXT); + clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); + + bgBrush = GetSysColorBrush(COLOR_MENU); + hotBrush = GetSysColorBrush(m_useFlatMenus ? COLOR_MENUHILIGHT : COLOR_HIGHLIGHT); + + rc = cdraw->nmcd.rc; + hdc = cdraw->nmcd.hdc; + + isHot = m_hotBar == this && m_hotItem == static_cast<INT>(cdraw->nmcd.dwItemSpec); + isPopup = m_popupBar == this && m_popupItem == static_cast<INT>(cdraw->nmcd.dwItemSpec); + + if (isHot || (m_hotItem < 0 && isPopup)) + { + cdraw->nmcd.uItemState |= CDIS_HOT; + } + else + { + cdraw->nmcd.uItemState &= ~CDIS_HOT; + } + + if (cdraw->nmcd.uItemState&CDIS_HOT) + { + FillRect(hdc, &rc, hotBrush); + SetTextColor(hdc, clrTextHighlight); + cdraw->clrText = clrTextHighlight; + } + else + { + FillRect(hdc, &rc, bgBrush); + SetTextColor(hdc, clrText); + cdraw->clrText = clrText; + } + + cdraw->iListGap += 4; + + *theResult = CDRF_NOTIFYPOSTPAINT | TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOOFFSET | TBCDRF_NOMARK | 0x00800000; // FIXME: the last bit is Vista+, for debugging only + return S_OK; + + case CDDS_ITEMPOSTPAINT: + btni.cbSize = sizeof(btni); + btni.dwMask = TBIF_STYLE; + SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, cdraw->nmcd.dwItemSpec, reinterpret_cast<LPARAM>(&btni)); + if (btni.fsStyle & BTNS_DROPDOWN) + { + SelectObject(cdraw->nmcd.hdc, m_marlett); + WCHAR text[] = L"8"; + SetBkMode(cdraw->nmcd.hdc, TRANSPARENT); + RECT rc = cdraw->nmcd.rc; + rc.right += 1; + DrawTextEx(cdraw->nmcd.hdc, text, 1, &rc, DT_NOCLIP | DT_VCENTER | DT_RIGHT | DT_SINGLELINE, NULL); + } + *theResult = TRUE; + return S_OK; + } + return S_OK; } CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : @@ -845,10 +849,18 @@ return S_OK; } -HRESULT CMenuStaticToolbar::FillToolbar() +HRESULT CMenuStaticToolbar::FillToolbar(BOOL clearFirst) { int i; int ic = GetMenuItemCount(m_hmenu); + + if (clearFirst) + { + while (SendMessage(m_hwndToolbar, TB_DELETEBUTTON, 0, 0)) + { + // empty; + } + } int count = 0; for (i = 0; i < ic; i++) @@ -896,6 +908,14 @@ } } + DbgPrint("Created toolbar with %d buttons.\n", count); + + return S_OK; +} + +HRESULT CMenuStaticToolbar::OnDeletingButton(const NMTOOLBAR * tb) +{ + delete reinterpret_cast<SMINFO*>(tb->tbButton.dwData); return S_OK; } @@ -959,7 +979,7 @@ { } -HRESULT CMenuSFToolbar::FillToolbar() +HRESULT CMenuSFToolbar::FillToolbar(BOOL clearFirst) { HRESULT hr; int i = 0; @@ -1009,7 +1029,15 @@ return AddPlaceholder(); } + DbgPrint("Created toolbar with %d buttons.\n", i); + return hr; +} + +HRESULT CMenuSFToolbar::OnDeletingButton(const NMTOOLBAR * tb) +{ + ILFree(reinterpret_cast<LPITEMIDLIST>(tb->tbButton.dwData)); + return S_OK; } HRESULT CMenuSFToolbar::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) 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] Tue Mar 11 10:42:25 2014 @@ -74,7 +74,7 @@ void InvalidateDraw(); - virtual HRESULT FillToolbar() = 0; + virtual HRESULT FillToolbar(BOOL clearFirst=FALSE) = 0; virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; HRESULT PopupItem(INT uItem); @@ -84,6 +84,7 @@ protected: virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb) = 0; virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData) = 0; virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData) = 0; @@ -94,6 +95,9 @@ HRESULT AddPlaceholder(); HRESULT UpdateImageLists(); + +private: + HRESULT OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult); }; class CMenuStaticToolbar : @@ -109,11 +113,13 @@ HRESULT SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); - virtual HRESULT FillToolbar(); + virtual HRESULT FillToolbar(BOOL clearFirst=FALSE); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); virtual HRESULT OnContextMenu(NMMOUSE * rclick); protected: + virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb); + virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData); }; @@ -133,11 +139,13 @@ HRESULT SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); HRESULT GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); - virtual HRESULT FillToolbar(); + virtual HRESULT FillToolbar(BOOL clearFirst=FALSE); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); virtual HRESULT OnContextMenu(NMMOUSE * rclick); protected: + virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb); + virtual HRESULT InternalPopupItem(INT uItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalHasSubMenu(INT uItem, INT index, DWORD_PTR dwData); }; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Tue Mar 11 10:42:25 2014 @@ -822,7 +822,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew() { CComPtr<IShellMenu> menuBar; - CComPtr<IUnknown> logoBar; + //CComPtr<IUnknown> logoBar; CComPtr<IUnknown> toolsBar; CComPtr<IUnknown> navigationBar; CComPtr<IOleWindow> menuOleWindow; @@ -840,12 +840,14 @@ hResult = menuOleWindow->GetWindow(&fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count + /* FIXME hResult = CreateBrandBand(&logoBar); if (FAILED(hResult)) return hResult; AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); fLogoBar.Attach(logoBar.Detach()); // transfer the ref count + */ hResult = CreateToolsBar(&toolsBar); if (FAILED(hResult)) @@ -1217,8 +1219,8 @@ return E_POINTER; if (dwBandID == ITBBID_MENUBAND && fMenuBar.p != NULL) return fMenuBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb)); - if (dwBandID == ITBBID_BRANDBAND && fLogoBar.p != NULL) - return fLogoBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb)); + //if (dwBandID == ITBBID_BRANDBAND && fLogoBar.p != NULL) + // return fLogoBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb)); *ppstb = NULL; return E_FAIL; } Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] Tue Mar 11 10:42:25 2014 @@ -87,7 +87,7 @@ CComPtr<IShellMenu> fMenuBar; // the menu rebar HWND fMenuBandWindow; HWND fNavigationWindow; - CComPtr<IUnknown> fLogoBar; // the reactos logo + //CComPtr<IUnknown> fLogoBar; // the reactos logo CComPtr<IUnknown> fControlsBar; // navigation controls CComPtr<IUnknown> fNavigationBar; // address bar CComObject<CMenuCallback> fMenuCallback; Modified: branches/shell-experiments/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] Tue Mar 11 10:42:25 2014 @@ -76,6 +76,12 @@ #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 + WINE_DEFAULT_DEBUG_CHANNEL(browseui); #endif /* _BROWSEUI_PCH_ */ Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue Mar 11 10:42:25 2014 @@ -814,29 +814,6 @@ ShowWindow(SW_SHOWNORMAL); - - // test code to make brand band animate - { - CComPtr<IOleCommandTarget> oleCommandTarget; - CComPtr<IServiceProvider> serviceProvider; - CComPtr<IBandSite> bandSite; - CComPtr<IDeskBand> deskBand; - CComPtr<IWinEventHandler> winEventHandler; - HRESULT hResult; - - if (fClientBars[BIInternetToolbar].clientBar.p == NULL) - return 0; - hResult = fClientBars[BIInternetToolbar].clientBar-> - QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); - hResult = serviceProvider->QueryService(SID_IBandSite, IID_IBandSite, reinterpret_cast<void **>(&bandSite)); - hResult = bandSite->QueryBand(5, &deskBand, NULL, NULL, 0); - deskBand->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler)); - winEventHandler->IsWindowOwner(NULL); - deskBand->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); - oleCommandTarget->QueryStatus(&CGID_BrandCmdGroup, 0, NULL, NULL); - oleCommandTarget->Exec(&CGID_BrandCmdGroup, BBID_STARTANIMATION, 0, NULL, NULL); - } - return S_OK; } @@ -3256,6 +3233,9 @@ TranslateMessage(&Msg); DispatchMessage(&Msg); + + if (Msg.message == WM_QUIT) + break; } } }

10 years, 6 months

[pschweitzer] 62471: [FASTFAT] Add support for more notifications on file modification. CORE-2582

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Mar 11 07:22:28 2014 New Revision: 62471 URL: http://svn.reactos.org/svn/reactos?rev=62471&view=rev Log: [FASTFAT] Add support for more notifications on file modification. CORE-2582 Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Tue Mar 11 07:22:28 2014 @@ -1000,6 +1000,8 @@ if(!(*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) { LARGE_INTEGER SystemTime; + ULONG Filter; + // set dates and times KeQuerySystemTime (&SystemTime); if (Fcb->Flags & FCB_IS_FATX_ENTRY) @@ -1019,6 +1021,20 @@ } /* set date and times to dirty */ Fcb->Flags |= FCB_IS_DIRTY; + + /* Time to notify the OS */ + Filter = FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_ATTRIBUTES; + if (ByteOffset.QuadPart != OldFileSize.QuadPart) Filter |= FILE_NOTIFY_CHANGE_SIZE; + + FsRtlNotifyFullReportChange(IrpContext->DeviceExt->NotifySync, + &(IrpContext->DeviceExt->NotifyList), + (PSTRING)&Fcb->PathNameU, + Fcb->PathNameU.Length - Fcb->LongNameU.Length, + NULL, + NULL, + Filter, + FILE_ACTION_MODIFIED, + NULL); } }

10 years, 6 months

[cwittich] 62470: [comctl32] rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 11 05:09:14 2014 New Revision: 62470 URL: http://svn.reactos.org/svn/reactos?rev=62470&view=rev Log: [comctl32] rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL Modified: trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/reactos/wine/commctrl.h Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Tue Mar 11 05:09:14 2014 @@ -205,7 +205,7 @@ /* Used to find undocumented extended styles */ #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ - TBSTYLE_EX_UNDOC1 | \ + TBSTYLE_EX_VERTICAL | \ TBSTYLE_EX_MIXEDBUTTONS | \ TBSTYLE_EX_DOUBLEBUFFER | \ TBSTYLE_EX_HIDECLIPPEDBUTTONS) @@ -1257,7 +1257,7 @@ * the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE * flag, and set the TBSTATE_WRAP flags manually on the appropriate items. * -* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow +* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_VERTICAL can be used also to allow * vertical toolbar lists. */ @@ -1273,7 +1273,7 @@ /* no layout is necessary. Applications may use this style */ /* to perform their own layout on the toolbar. */ if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && - !(infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1) ) return; + !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return; btnPtr = infoPtr->buttons; x = infoPtr->nIndent; @@ -3023,7 +3023,7 @@ cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER; cx = parent_rect.right - parent_rect.left; - if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1)) + if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) { TOOLBAR_LayoutToolbar(infoPtr); InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); @@ -3333,7 +3333,7 @@ if (lpTbInfo == NULL) return -1; - /* MSDN documents a iImageLabel field added in Vista but it is not present in + /* MSDN documents an iImageLabel field added in Vista but it is not present in * the headers and tests shows that even with comctl 6 Vista accepts only the * original TBBUTTONINFO size */ @@ -4132,7 +4132,7 @@ { /* separator */ nmtbr.tbButton.fsStyle = TBSTYLE_SEP; - /* when inserting separators, iBitmap controls it's size. + /* when inserting separators, iBitmap controls its size. 0 sets default size (width) */ nmtbr.tbButton.iBitmap = 0; } Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Tue Mar 11 05:09:14 2014 @@ -949,7 +949,6 @@ #define TBSTYLE_CUSTOMERASE 0x2000 #define TBSTYLE_REGISTERDROP 0x4000 #define TBSTYLE_TRANSPARENT 0x8000 -#define TBSTYLE_EX_DRAWDDARROWS 0x1 #define BTNS_BUTTON TBSTYLE_BUTTON #define BTNS_SEP TBSTYLE_SEP @@ -962,9 +961,12 @@ #define BTNS_SHOWTEXT 0x40 #define BTNS_WHOLEDROPDOWN 0x80 -#define TBSTYLE_EX_MIXEDBUTTONS 0x8 -#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x10 -#define TBSTYLE_EX_DOUBLEBUFFER 0x80 +#define TBSTYLE_EX_DRAWDDARROWS 0x00000001 +#define TBSTYLE_EX_MULTICOLUMN 0x00000002 +#define TBSTYLE_EX_VERTICAL 0x00000004 +#define TBSTYLE_EX_MIXEDBUTTONS 0x00000008 +#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010 /* don't show partially obscured buttons */ +#define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 /* Double Buffer the toolbar */ typedef struct _NMTBCUSTOMDRAW { NMCUSTOMDRAW nmcd; Modified: trunk/reactos/include/reactos/wine/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/commc… ============================================================================== --- trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] Tue Mar 11 05:09:14 2014 @@ -63,7 +63,6 @@ typedef LVFINDINFOW *LPLVFINDINFOW; #define SB_SETBORDERS (WM_USER+5) -#define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */ /* these are undocumented and the names are guesses */ typedef struct

10 years, 6 months

[dquintana] 62469: [RSHELL] * Give TrackPopupMenuEx the top-level window. Need to figure out how Windows does this, it probably does not simply use the top-level window that way. * Give TrackPopupM...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Mar 10 12:01:37 2014 New Revision: 62469 URL: http://svn.reactos.org/svn/reactos?rev=62469&view=rev Log: [RSHELL] * Give TrackPopupMenuEx the top-level window. Need to figure out how Windows does this, it probably does not simply use the top-level window that way. * Give TrackPopupMenuEx better flags and a better exclude rect. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.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 10 12:01:37 2014 @@ -622,18 +622,22 @@ { HWND sendTo = m_menuOwner; - // FIXME: use? - //TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude }; + TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude }; + + UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; if (sendTo) { - ::TrackPopupMenuEx(popup, 0, x, y, sendTo, NULL); // &params); + ::TrackPopupMenuEx(popup, flags, x, y, sendTo, &params); } else { + // FIXME: Windows uses the top-level window when calling TrackPopupMenuEx, + // but this is probably not the means by which it obtains that HWND. + // Meanwhile, this works. GetWindow(&sendTo); - ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, sendTo, NULL); // &params); - // TODO: use the result somehow + sendTo = GetAncestor(sendTo, GA_ROOT); + ::TrackPopupMenuEx(popup, flags, x, y, sendTo, &params); } return S_OK; 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 10 12:01:37 2014 @@ -549,17 +549,17 @@ if (!SendMessage(m_hwndToolbar, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc))) return E_FAIL; - GetWindowRect(m_hwnd, &rcx); + GetClientRect(m_hwndToolbar, &rcx); POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; - POINT c = { rcx.left, rcx.top }; - POINT d = { rcx.right, rcx.bottom }; + POINT c = { rc.left, rc.top }; + POINT d = { rc.right, rc.bottom }; ClientToScreen(m_hwndToolbar, &a); ClientToScreen(m_hwndToolbar, &b); - ClientToScreen(m_hwnd, &c); - ClientToScreen(m_hwnd, &d); + ClientToScreen(m_hwndToolbar, &c); + ClientToScreen(m_hwndToolbar, &d); POINT pt = { a.x, b.y }; RECT rcl = { c.x, c.y, d.x, d.y }; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Mar 10 12:01:37 2014 @@ -24,6 +24,8 @@ */ #include "precomp.h" + +#define USE_CUSTOM_MENUBAND 1 // navigation controls and menubar just send a message to parent window /* @@ -374,7 +376,7 @@ favoritesHMenu = GetSubMenu(parentHMenu, 3); if (favoritesHMenu == NULL) return E_FAIL; -#if 1 +#if USE_CUSTOM_MENUBAND HMODULE hrs = LoadLibrary(L"rshell.dll"); PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); @@ -553,7 +555,7 @@ HWND ownerWindow; HRESULT hResult; -#if 1 +#if USE_CUSTOM_MENUBAND HMODULE hrs = LoadLibraryW(L"rshell.dll"); if (!hrs)

10 years, 6 months

[ekohl] 62468: [MSGINA] Display warning messages if a user tries to log on using a non-existing account name, a wrong password or if the account was disabled.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 9 17:48:42 2014 New Revision: 62468 URL: http://svn.reactos.org/svn/reactos?rev=62468&view=rev Log: [MSGINA] Display warning messages if a user tries to log on using a non-existing account name, a wrong password or if the account was disabled. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/sq-AL.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -943,19 +943,26 @@ goto done; Status = DoLoginTasks(pgContext, UserName, Domain, Password, &SubStatus); - if (!NT_SUCCESS(Status)) - { -TRACE("DoLoginTasks failed! Status 0x%08lx SubStatus 0x%08lx\n", Status, SubStatus); + if (Status == STATUS_LOGON_FAILURE) + { + ResourceMessageBox(pgContext, + hwndDlg, + MB_OK | MB_ICONEXCLAMATION, + IDS_LOGONTITLE, + IDS_LOGONWRONGUSERORPWD); + goto done; + } + else if (Status == STATUS_ACCOUNT_RESTRICTION) + { + TRACE("DoLoginTasks failed! Status 0x%08lx SubStatus 0x%08lx\n", Status, SubStatus); if (SubStatus == STATUS_ACCOUNT_DISABLED) { -TRACE("Account disabled!\n"); - pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx, - hwndDlg, - L"Account disabled!", - L"Logon error", - MB_OK | MB_ICONERROR); - + ResourceMessageBox(pgContext, + hwndDlg, + MB_OK | MB_ICONEXCLAMATION, + IDS_LOGONTITLE, + IDS_LOGONUSERDISABLED); goto done; } else if (SubStatus == STATUS_ACCOUNT_LOCKED_OUT) @@ -979,6 +986,13 @@ goto done; } } + else if (!NT_SUCCESS(Status)) + { +TRACE("DoLoginTasks failed! Status 0x%08lx\n", Status); + + goto done; + } + if (!CreateProfile(pgContext, UserName, Domain, Password)) { Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -140,11 +140,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -145,11 +145,14 @@ IDS_LOGONMSG "Jste pÅihlÃ¡Å¡eni jako %s." IDS_LOGONDATE "Datum pÅihlÃ¡Å¡enÃ: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -140,11 +140,14 @@ IDS_LOGONMSG "Sie sind angemeldet als %s." IDS_LOGONDATE "Anmeldedatum: %s %s" IDS_COMPUTERLOCKED "Computer ist gesperrt" - IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch. Bitte geben Sie das Passwort erneut ein. Bei Buchstaben des Passworts wird GroÃ- und Kleinschreibung unterschieden." - IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt. Nur %s\\%s oder ein Administrator kann den Computer entsperren." + IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch. Bitte geben Sie das Passwort erneut ein. Bei Buchstaben des Passworts wird GroÃ- und Kleinschreibung unterschieden." + IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt. Nur %s\\%s oder ein Administrator kann den Computer entsperren." IDS_CHANGEPWDTITLE "Passwort Ã¤ndern" IDS_NONMATCHINGPASSWORDS "Die eingegebenen Passworte stimmen nicht Ã¼berein. Geben Sie das neue Passwort in beide Textfelder ein." IDS_PASSWORDCHANGED "Ihr Passwort wurde geÃ¤ndert." + IDS_LOGONTITLE "Anmeldemeldung" + IDS_LOGONWRONGUSERORPWD "Sie konnten nicht angemeldet werden. PrÃ¼fen Sie Benutzername und DomÃ¤ne, und geben Sie das Passwort erneut ein. Bei Passworten wird GroÃ- und Kleinschreibung unterschieden." + IDS_LOGONUSERDISABLED "Ihr Konto wurde deaktiviert. Wenden Sie sich an Ihren Systemadministrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -135,16 +135,19 @@ IDS_PRESSCTRLALTDELETE "Press Control+Alt+Delete to Logon." IDS_ASKFORUSER "User name: " IDS_ASKFORPASSWORD "Password: " - IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data. Continue?" + IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data. Continue?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -142,11 +142,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -140,11 +140,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -140,11 +140,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "×ª××¨×× ×× ××¡×: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -137,13 +137,17 @@ IDS_ASKFORPASSWORD "Kata sandi: " IDS_FORCELOGOFF "Ini akan mengeluarkan pengguna saat ini dan kehilangan data yang belum disimpan. Lanjutkan?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -148,11 +148,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Dati di accesso: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -140,11 +140,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -140,11 +140,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -149,11 +149,14 @@ IDS_LOGONMSG "JesteÅ zalogowany jako %s." IDS_LOGONDATE "Data logowania: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -142,11 +142,14 @@ IDS_LOGONMSG "SunteÈi autentificat ca %s." IDS_LOGONDATE "Data autentificÄrii: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -142,11 +142,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "ÐÐ°ÑÐ° Ð²ÑÐ¾Ð´Ð°: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -145,11 +145,14 @@ IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -145,6 +145,12 @@ IDS_COMPUTERLOCKED "Kompjuter mbyllur" IDS_LOCKEDWRONGPASSWORD "FjalÃ«kalimi Ã«shtÃ« gabim. Ju lutem shkruani fjalÃ«kalimin tuaj pÃ«rsÃ«ri. GÃ«rmat nÃ« fjalÃ«kalim duhet tÃ« shkruhen duke pÃ«rdorur rastin e duhur." IDS_LOCKEDWRONGUSER "Ky kompjuter Ã«shtÃ« i bllokuar. VetÃ«m %s\\%s ose njÃ« Administrator mund tÃ« zhbllokoj kÃ«tÃ« kompjuter." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -147,6 +147,9 @@ IDS_CHANGEPWDTITLE "Åifre DeÄÅtirme" IDS_NONMATCHINGPASSWORDS "YazÄ±dÄ±ÄÄ±nÄ±z bu Åifreler birbiriyle uyuÅmuyor. Her iki metin kutusuna da aynÄ± Åifreyi yazÄ±nÄ±z." IDS_PASSWORDCHANGED "Åifreniz deÄiÅtirildi." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -153,6 +153,9 @@ IDS_CHANGEPWDTITLE "Change Password" IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." + IDS_LOGONTITLE "Logon Message" + IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." + IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Sun Mar 9 17:48:42 2014 @@ -54,6 +54,9 @@ #define IDS_CHANGEPWDTITLE 40012 #define IDS_NONMATCHINGPASSWORDS 40013 #define IDS_PASSWORDCHANGED 40014 +#define IDS_LOGONTITLE 40015 +#define IDS_LOGONWRONGUSERORPWD 40016 +#define IDS_LOGONUSERDISABLED 40017 #define IDS_SHUTDOWN_SHUTDOWN 50000 #define IDS_SHUTDOWN_LOGOFF 50001

10 years, 6 months

[cwittich] 62467: [usetup] exit when no usable disks are found

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 9 14:19:56 2014 New Revision: 62467 URL: http://svn.reactos.org/svn/reactos?rev=62467&view=rev Log: [usetup] exit when no usable disks are found Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Mar 9 14:19:56 2014 @@ -1472,6 +1472,11 @@ /* FIXME: show an error dialog */ return QUIT_PAGE; } + else if (IsListEmpty (&PartitionList->DiskListHead)) + { + MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } } DrawPartitionList(PartitionList);

10 years, 6 months

[tkreuzer] 62466: [PSEH3] - Add AllocaFrame field to the exception registration record. It is required for Clang and C++ handlers. - Fix the way how "nested functions" are emulated on Clang and C++...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 9 13:55:26 2014 New Revision: 62466 URL: http://svn.reactos.org/svn/reactos?rev=62466&view=rev Log: [PSEH3] - Add AllocaFrame field to the exception registration record. It is required for Clang and C++ handlers. - Fix the way how "nested functions" are emulated on Clang and C++, respecting the fact that the compiler can and will use a temporary esp-based stack frame below any alloca-allocations for function invocation. This uses the AllocaFrame field to calculate and setup a new temp stack frame for the "nested functions". - Make use of the HandlerType field in the exception registration record to use different methods for invoking filters / finally functions. - Write @_SEH3$_CallRtlUnwind@4 in raw asm instead of inline, because Clang cannot deal with stdcall decorations in inline asm (see http://llvm.org/bugs/show_bug.cgi?id=19027) - Make sure ExceptionPointers are properly initialized in _SEH3$_except_handler Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3.c trunk/reactos/lib/pseh/i386/pseh3_asmdef.h trunk/reactos/lib/pseh/i386/pseh3_i386.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Mar 9 13:55:26 2014 @@ -67,6 +67,8 @@ /* Registers that we need to save */ unsigned long Esp; unsigned long Ebp; + + char* AllocaFrame; #ifdef _SEH3$_FRAME_ALL_NONVOLATILES unsigned long Ebx; unsigned long Esi; @@ -101,10 +103,12 @@ _SEH3$_TryLevel = 0, }; +#ifndef __clang__ /* These are global dummy definitions, that get overwritten in the local context of __finally / __except blocks */ int __cdecl __attribute__((error ("Can only be used inside a __finally block."))) _abnormal_termination(void); unsigned long __cdecl __attribute__((error("Can only be used inside an exception filter or __except block."))) _exception_code(void); void * __cdecl __attribute__((error("Can only be used inside an exception filter."))) _exception_info(void); +#endif /* This attribute allows automatic cleanup of the registered frames */ #define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_Unregister))) @@ -119,15 +123,16 @@ #define _SEH3$_ASM_GOTO(_Label, ...) int -__attribute__((regparm(2))) +__attribute__((regparm(3))) __attribute__((returns_twice)) _SEH3$_RegisterFrameWithNonVolatiles( volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame, - const SEH3$_SCOPE_TABLE* ScopeTable); + const SEH3$_SCOPE_TABLE* ScopeTable, + void* AllocaFrame); #define _SEH3$_RegisterFrame_(_TrylevelFrame, _DataTable) \ do { \ - int result = _SEH3$_RegisterFrameWithNonVolatiles(_TrylevelFrame, _DataTable); \ + int result = _SEH3$_RegisterFrameWithNonVolatiles(_TrylevelFrame, _DataTable, __builtin_alloca(0)); \ if (__builtin_expect(result != 0, 0)) \ { \ if (result == 1) goto _SEH3$_l_FilterOrFinally; \ @@ -137,15 +142,16 @@ } while(0) int -__attribute__((regparm(2))) +__attribute__((regparm(3))) __attribute__((returns_twice)) _SEH3$_RegisterTryLevelWithNonVolatiles( volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame, - const SEH3$_SCOPE_TABLE* ScopeTable); + const SEH3$_SCOPE_TABLE* ScopeTable, + void* AllocaFrame); #define _SEH3$_RegisterTryLevel_(_TrylevelFrame, _DataTable) \ do { \ - int result = _SEH3$_RegisterTryLevelWithNonVolatiles(_TrylevelFrame, _DataTable); \ + int result = _SEH3$_RegisterTryLevelWithNonVolatiles(_TrylevelFrame, _DataTable, __builtin_alloca(0)); \ if (__builtin_expect(result != 0, 0)) \ { \ if (result == 1) goto _SEH3$_l_FilterOrFinally; \ @@ -163,25 +169,34 @@ #define _SEH3$_ASM_GOTO(_Label, ...) asm goto ("#\n" : : : "memory", ## __VA_ARGS__ : _Label) +#ifdef __cplusplus +#define _SEH3$_CALL_WRAPPER(_Function, _TrylevelFrame, _DataTable) \ + asm goto ("leal %0, %%eax\n" \ + "leal %1, %%edx\n" \ + "call " #_Function "WithStackLayout\n" \ + : \ + : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)), "c"(__builtin_alloca(0)) \ + : "eax", "edx", "memory" \ + : _SEH3$_l_HandlerTarget, _SEH3$_l_FilterOrFinally) + +#else +#define _SEH3$_CALL_WRAPPER(_Function, _TrylevelFrame, _DataTable) \ + asm goto ("leal %0, %%eax\n" \ + "leal %1, %%edx\n" \ + "call " #_Function "\n" \ + : \ + : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)) \ + : "eax", "edx", "ecx", "memory" \ + : _SEH3$_l_HandlerTarget) +#endif + /* This is an asm wrapper around _SEH3$_RegisterFrame */ #define _SEH3$_RegisterFrame_(_TrylevelFrame, _DataTable) \ - asm goto ("leal %0, %%eax\n" \ - "leal %1, %%edx\n" \ - "call __SEH3$_RegisterFrame\n" \ - : \ - : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)) \ - : "ecx", "edx", "memory" \ - : _SEH3$_l_HandlerTarget) + _SEH3$_CALL_WRAPPER(__SEH3$_RegisterFrame, _TrylevelFrame, _DataTable) /* This is an asm wrapper around _SEH3$_RegisterTryLevel */ #define _SEH3$_RegisterTryLevel_(_TrylevelFrame, _DataTable) \ - asm goto ("leal %0, %%eax\n" \ - "leal %1, %%edx\n" \ - "call __SEH3$_RegisterTryLevel\n" \ - : \ - : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)) \ - : "ecx", "edx", "memory" \ - : _SEH3$_l_HandlerTarget) + _SEH3$_CALL_WRAPPER(__SEH3$_RegisterTryLevel, _TrylevelFrame, _DataTable) /* This construct scares GCC so much, that it will stop moving code around into places that are never executed. */ @@ -214,15 +229,17 @@ /* The "nested" functions are a piece of code with a ret instruction at the end */ #define _SEH3$_NESTED_FUNC_OPEN() \ { \ - int SavedEsp, result = 0; \ -\ - /* Save esp */ \ - asm volatile ("movl %%esp, %[SavedEsp]\n" : : [SavedEsp]"m"(SavedEsp)); + int _SEH3$_Result = 0; \ + +/* On invocation, the AllocaFrame field is loaded with the return esp value */ +#define _SEH3$_NESTED_FUNC_RETURN() \ + /* Restore esp and return to the caller */ \ + asm volatile ("movl %[FixedEsp], %%esp\nret\n" \ + : : "a"(_SEH3$_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "memory") #define _SEH3$_NESTED_FUNC_CLOSE() \ - /* Restore esp and return to the caller */ \ - asm volatile ("movl %[SavedEsp], %%esp\nret\n" \ - : : "a"(result), [SavedEsp]"irm"(SavedEsp)); \ + /* Return to the caller */ \ + _SEH3$_NESTED_FUNC_RETURN(); \ } /* The filter function */ @@ -230,7 +247,7 @@ _SEH3$_NESTED_FUNC_OPEN() \ { \ /* Evaluate the filter expression */ \ - result = (expression); \ + _SEH3$_Result = (expression); \ } \ _SEH3$_NESTED_FUNC_CLOSE() @@ -238,11 +255,10 @@ _SEH3$_NESTED_FUNC_OPEN() \ /* This construct makes sure that the finally function returns */ \ /* a proper value at the end */ \ - for (; ; (void)({asm volatile ("movl %[SavedEsp], %%esp\nret\n" \ - : : "a"(result), [SavedEsp]"irm"(SavedEsp)); 0;})) + for (; ; (void)({_SEH3$_NESTED_FUNC_RETURN(); 0;})) #define _SEH3$_FILTER(_Filter, _FilterExpression) (&&_SEH3$_l_FilterOrFinally) -#define _SEH3$_FINALLY(_Finally) 0 +#define _SEH3$_FINALLY(_Finally) (&&_SEH3$_l_FilterOrFinally) #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() @@ -336,6 +352,7 @@ __label__ _SEH3$_l_OnException; \ __label__ _SEH3$_l_BeforeFilterOrFinally; \ __label__ _SEH3$_l_FilterOrFinally; \ + (void)&&_SEH3$_l_OnException; \ (void)&&_SEH3$_l_BeforeFilterOrFinally; \ (void)&&_SEH3$_l_FilterOrFinally; \ \ @@ -419,7 +436,7 @@ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \ \ /* Create a static data table that contains the finally function */ \ - static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { 0, _SEH3$_FINALLY(&_SEH3$_FinallyFunction) }; \ + static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { 0, _SEH3$_FINALLY(&_SEH3$_FinallyFunction), _SEH3$_TryLevel, _SEH3$_HANDLER_TYPE }; \ \ /* Register the registration record. */ \ if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ @@ -431,6 +448,7 @@ _SEH3$_EnforceFramePointer(); \ \ _SEH3$_l_BeforeFilterOrFinally: (void)0; \ + _SEH3$_EnforceFramePointer(); \ _SEH3$_l_FilterOrFinally: (void)0; \ _SEH3$_FINALLY_FUNC_OPEN(_SEH3$_FinallyFunction) Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Sun Mar 9 13:55:26 2014 @@ -63,8 +63,8 @@ static inline LONG -_SEH3$_InvokeFilter( - PVOID Record, +_SEH3$_InvokeNestedFunctionFilter( + PSEH3$_REGISTRATION_FRAME RegistrationFrame, PVOID Filter) { LONG FilterResult; @@ -78,14 +78,54 @@ /* The result is the frame base address that we passed in (0) plus the offset to the registration record. */ "negl %%eax\n\t" - "addl %[Record], %%eax\n\t" + "addl %[RegistrationFrame], %%eax\n\t" /* Second call to get the filter result */ "mov $1, %%ecx\n\t" "call *%[Filter]\n\t" : "=a"(FilterResult) - : [Record] "m" (Record), [Filter] "m" (Filter) + : [RegistrationFrame] "m" (RegistrationFrame), [Filter] "m" (Filter) : "ecx", "edx"); + + return FilterResult; +} + +long +__attribute__((regparm(1))) +_SEH3$_InvokeEmbeddedFilter( + PSEH3$_REGISTRATION_FRAME RegistrationFrame); + +long +__attribute__((regparm(1))) +_SEH3$_InvokeEmbeddedFilterFromRegistration( + PSEH3$_REGISTRATION_FRAME RegistrationFrame); + +static inline +LONG +_SEH3$_InvokeFilter( + PSEH3$_REGISTRATION_FRAME RegistrationFrame, + PVOID Filter) +{ + LONG FilterResult; + + if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_NESTED_HANDLER) + { + return _SEH3$_InvokeNestedFunctionFilter(RegistrationFrame, Filter); + } + else if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_CPP_HANDLER) + { + /* Call the embedded filter function */ + return _SEH3$_InvokeEmbeddedFilter(RegistrationFrame); + } + else if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_CLANG_HANDLER) + { + return _SEH3$_InvokeEmbeddedFilterFromRegistration(RegistrationFrame); + } + else + { + /* Should not happen! Skip this handler */ + FilterResult = EXCEPTION_CONTINUE_SEARCH; + } return FilterResult; } @@ -136,45 +176,51 @@ _SEH3$_JumpToTarget( PSEH3$_REGISTRATION_FRAME RegistrationFrame) { - asm volatile ( - /* Load the registers */ - "movl 20(%%ecx), %%esp\n" - "movl 24(%%ecx), %%ebp\n" - - /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */ - "addl $4, %%esp\n" - - /* Jump into the exception handler */ - "jmp *%[Target]\n" - : : - "c" (RegistrationFrame), - "a" (RegistrationFrame->ScopeTable), - [Target] "m" (RegistrationFrame->ScopeTable->Target) - ); + if (RegistrationFrame->ScopeTable->HandlerType == _SEH3$_CLANG_HANDLER) + { + asm volatile ( + /* Load the registers */ + "movl 20(%%ecx), %%esp\n" + "movl 24(%%ecx), %%ebp\n" + + /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */ + "addl $4, %%esp\n" + + /* Jump into the exception handler */ + "jmp *%[Target]\n" + : : + "c" (RegistrationFrame), + "a" (RegistrationFrame->ScopeTable), + [Target] "m" (RegistrationFrame->ScopeTable->Target) + ); + } + else + { + asm volatile ( + /* Load the registers */ + "movl 20(%%ecx), %%esp\n" + "movl 24(%%ecx), %%ebp\n" + + /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */ + "addl $4, %%esp\n" + + /* Jump into the exception handler */ + "jmp *%[Target]\n" + : : + "c" (RegistrationFrame), + "a" (RegistrationFrame->ScopeTable), + [Target] "m" (RegistrationFrame->ScopeTable->Target) + ); + } __builtin_unreachable(); } -static inline void +__fastcall _SEH3$_CallRtlUnwind( - PSEH3$_REGISTRATION_FRAME RegistrationFrame) -{ - LONG ClobberedEax; - - asm volatile( - "push %%ebp\n" - "push $0\n" - "push $0\n" - "push $0\n" - "push %[TargetFrame]\n" - "call _RtlUnwind@16\n" - "pop %%ebp\n" - : "=a" (ClobberedEax) - : [TargetFrame] "a" (RegistrationFrame) - : "ebx", "ecx", "edx", "esi", - "edi", "flags", "memory"); -} + PSEH3$_REGISTRATION_FRAME RegistrationFrame); + EXCEPTION_DISPOSITION __cdecl @@ -192,6 +238,10 @@ /* Clear the direction flag. */ asm volatile ("cld\n" : : : "memory"); + /* Save the exception pointers on the stack */ + ExceptionPointers.ExceptionRecord = ExceptionRecord; + ExceptionPointers.ContextRecord = ContextRecord; + /* Check if this is an unwind */ if (ExceptionRecord->ExceptionFlags & EXCEPTION_UNWINDING) { @@ -200,10 +250,6 @@ } else { - /* Save the exception pointers on the stack */ - ExceptionPointers.ExceptionRecord = ExceptionRecord; - ExceptionPointers.ContextRecord = ContextRecord; - /* Loop all frames for this registration */ CurrentFrame = EstablisherFrame->EndOfChain; for (;;) Modified: trunk/reactos/lib/pseh/i386/pseh3_asmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_asmdef… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_asmdef.h [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_asmdef.h [iso-8859-1] Sun Mar 9 13:55:26 2014 @@ -7,9 +7,10 @@ #define SEH3_REGISTRATION_FRAME_ExceptionPointers 16 #define SEH3_REGISTRATION_FRAME_Esp 20 #define SEH3_REGISTRATION_FRAME_Ebp 24 -#define SEH3_REGISTRATION_FRAME_Ebx 28 -#define SEH3_REGISTRATION_FRAME_Esi 32 -#define SEH3_REGISTRATION_FRAME_Edi 36 +#define SEH3_REGISTRATION_FRAME_AllocaFrame 28 +#define SEH3_REGISTRATION_FRAME_Ebx 32 +#define SEH3_REGISTRATION_FRAME_Esi 36 +#define SEH3_REGISTRATION_FRAME_Edi 40 #define SEH3_SCOPE_TABLE_Target 0 #define SEH3_SCOPE_TABLE_Filter 4 Modified: trunk/reactos/lib/pseh/i386/pseh3_i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_i386.S… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] Sun Mar 9 13:55:26 2014 @@ -15,11 +15,12 @@ /* * void - * __attribute__((regparm(2))) + * __attribute__((regparm(3))) * __attribute__((returns_twice)) * _SEH3$_RegisterFrame[WithNonVolatiles]( * PSEH3$_REGISTRATION_FRAME RegistrationFrame<eax>, - * PSEH3$_SCOPE_TABLE ScopeTable<edx>); + * PSEH3$_SCOPE_TABLE ScopeTable<edx>, + * PVOID AllocaFrame); */ .global __SEH3$_RegisterFrameWithNonVolatiles __SEH3$_RegisterFrameWithNonVolatiles: @@ -29,6 +30,12 @@ mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi +.global __SEH3$_RegisterFrameWithStackLayout +__SEH3$_RegisterFrameWithStackLayout: + + /* Save the pointer to the alloca frame */ + mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], ecx + .global __SEH3$_RegisterFrame __SEH3$_RegisterFrame: @@ -57,11 +64,12 @@ /* * void - * __attribute__((regparm(2))) + * __attribute__((regparm(3))) * __attribute__((returns_twice)) * _SEH3$_RegisterTryLevel[WithNonVolatiles]( * PSEH3$_REGISTRATION_FRAME RegistrationFrame<edx>, - * PSEH3$_SCOPE_TABLE ScopeTable<eax>); + * PSEH3$_SCOPE_TABLE ScopeTable<eax>, + * PVOID AllocaFrame); */ .global __SEH3$_RegisterTryLevelWithNonVolatiles __SEH3$_RegisterTryLevelWithNonVolatiles: @@ -71,6 +79,12 @@ mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi +.global __SEH3$_RegisterTryLevelWithStackLayout +__SEH3$_RegisterTryLevelWithStackLayout: + + /* Save the pointer to the alloca frame */ + mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], ecx + .global __SEH3$_RegisterTryLevel __SEH3$_RegisterTryLevel: @@ -98,3 +112,105 @@ xor eax, eax ret + +.global __SEH3$_InvokeEmbeddedFilterFromRegistration +__SEH3$_InvokeEmbeddedFilterFromRegistration: + + /* Safe the current non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Load the non-volatiles from the registration invocation */ + mov ebx, [eax + SEH3_REGISTRATION_FRAME_Ebx] + mov esi, [eax + SEH3_REGISTRATION_FRAME_Esi] + mov edi, [eax + SEH3_REGISTRATION_FRAME_Edi] + mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp] + + /* Get the saved stack pointer */ + mov edx, [eax + SEH3_REGISTRATION_FRAME_Esp] + + xor eax, eax + inc eax + call [edx] + + /* Restore the current non-volatiles */ + pop edi + pop esi + pop ebx + pop ebp + + ret + + +.global __SEH3$_InvokeEmbeddedFilter +__SEH3$_InvokeEmbeddedFilter: + + /* Safe the current non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Load ebp from the registration invocation */ + mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp] + + /* Calculate the size of the temp stack frame region */ + mov ecx, [eax + SEH3_REGISTRATION_FRAME_AllocaFrame] + sub ecx, [eax + SEH3_REGISTRATION_FRAME_Esp] + + /* Put the return address on the stack */ + push offset __SEH3$_InvokeEmbeddedFilterReturn + + /* Save the current stack pointer in the AllocaFrame member */ + mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], esp + + /* Allocate enough temp stack space on the stack */ + sub esp, ecx + + /* Get the scope table */ + mov edx, [eax + SEH3_REGISTRATION_FRAME_ScopeTable] + + /* Jump into the filter or finally function */ + jmp [edx + SEH3_SCOPE_TABLE_Filter] + + /* We return to this label with a cleaned up stack */ +__SEH3$_InvokeEmbeddedFilterReturn: + + /* Restore the current non-volatiles */ + pop edi + pop esi + pop ebx + pop ebp + + ret + +/* + * void + * __fastcall + * _SEH3$_CallRtlUnwind( + * PSEH3$_REGISTRATION_FRAME RegistrationFrame<ecx>) + */ +.global @_SEH3$_CallRtlUnwind@4 +@_SEH3$_CallRtlUnwind@4: + + push ebp + mov ebp, esp + + push edi + push esi + push ebx + + push 0 /* ReturnValue */ + push 0 /* ExceptionRecord */ + push 0 /* TargetIp */ + push ecx /* TargetFrame */ + call _RtlUnwind@16 + + pop ebx + pop esi + pop edi + pop ebp + ret +

10 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
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