Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[hbelusca] 62282: [NTVDM] Start to implement EmulatorSimulate / EmulatorUnsimulate (used by VDDSimulate16 and VDDUnsimualte16). This piece of code can be better written, but it works for what I'm g...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 21 19:27:27 2014 New Revision: 62282 URL: http://svn.reactos.org/svn/reactos?rev=62282&view=rev Log: [NTVDM] Start to implement EmulatorSimulate / EmulatorUnsimulate (used by VDDSimulate16 and VDDUnsimualte16). This piece of code can be better written, but it works for what I'm going to commit next. Modified: branches/ntvdm/subsystems/ntvdm/clock.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/clock.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/clock.c [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -127,7 +127,6 @@ VgaHorizontalRetrace(); /* Continue CPU emulation */ - // EmulatorSimulate(); for (i = 0; (i < STEPS_PER_CYCLE) && VdmRunning; i++) { EmulatorStep(); Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -177,12 +177,18 @@ VOID EmulatorSimulate(VOID) { - UNIMPLEMENTED; + // FIXME: Do not mix VdmRunning (i.e. ntvdm running) and CpuSimulate!! + while (VdmRunning) ClockUpdate(); + + /* This takes into account for reentrance */ + VdmRunning = TRUE; } VOID EmulatorUnsimulate(VOID) { - UNIMPLEMENTED; + /* Stop simulation */ + // FIXME: Do not mix VdmRunning (i.e. ntvdm running) and CpuSimulate!! + VdmRunning = FALSE; } VOID EmulatorInterrupt(BYTE Number) Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -118,6 +118,8 @@ VOID EmulatorInterrupt(BYTE Number); VOID EmulatorInterruptSignal(VOID); VOID EmulatorStep(VOID); +VOID EmulatorSimulate(VOID); +VOID EmulatorUnsimulate(VOID); VOID EmulatorCleanup(VOID); VOID EmulatorSetA20(BOOLEAN Enabled); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -420,8 +420,8 @@ goto Cleanup; } - /* Main loop */ - while (VdmRunning) ClockUpdate(); + /* Start simulation */ + EmulatorSimulate(); /* Perform another screen refresh */ VgaRefreshDisplay();

10 years, 8 months

[hbelusca] 62281: [FONTVIEW] Unescaped use of percent character in a format string causes percent glyph not to be displayed. Patch by André Guibert de Bruet. CORE-7934 #resolve #comment Fixed in re...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 21 15:49:06 2014 New Revision: 62281 URL: http://svn.reactos.org/svn/reactos?rev=62281&view=rev Log: [FONTVIEW] Unescaped use of percent character in a format string causes percent glyph not to be displayed. Patch by André Guibert de Bruet. CORE-7934 #resolve #comment Fixed in revision 62281, thanks ;) Modified: trunk/reactos/base/applications/fontview/display.c Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Fri Feb 21 15:49:06 2014 @@ -113,7 +113,7 @@ TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); y += tm.tmHeight + 1; - swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')"); + swprintf(szCaption, L"0123456789.:,;(\"~!@#$%%^&*')"); TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); y += tm.tmHeight + 1;

10 years, 8 months

[dquintana] 62280: [RSHELL] * CMenuBand, CMenuDeskBar: Improve the SubMenu hierarchy and OnSelect flow. Now the menu will spread a FullCancel or Execute upwards and close the whole start menu. CORE...

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Feb 21 10:00:00 2014 New Revision: 62280 URL: http://svn.reactos.org/svn/reactos?rev=62280&view=rev Log: [RSHELL] * CMenuBand, CMenuDeskBar: Improve the SubMenu hierarchy and OnSelect flow. Now the menu will spread a FullCancel or Execute upwards and close the whole start menu. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.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] Fri Feb 21 10:00:00 2014 @@ -140,7 +140,8 @@ CComPtr<IOleWindow> m_site; CComPtr<IShellMenuCallback> m_psmc; - CComPtr<IMenuPopup> m_childMenu; + CComPtr<IMenuPopup> m_subMenuChild; + CComPtr<IMenuPopup> m_subMenuParent; UINT m_uId; UINT m_uIdAncestor; @@ -269,7 +270,7 @@ HRESULT _GetTopLevelWindow(HWND*topLevel); HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id); HRESULT _MenuItemHotTrack(DWORD changeType); - HRESULT _OnPopupSubMenu(IMenuPopup * popup); + HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude); BOOL UseBigIcons() { @@ -332,7 +333,7 @@ private: // TODO: make dynamic -#define MAX_RECURSE 100 +#define MAX_RECURSE 20 CMenuBand* m_bandStack[MAX_RECURSE]; int m_bandCount; @@ -357,6 +358,8 @@ if (pItem) *pItem = m_bandStack[m_bandCount]; + + m_bandStack[m_bandCount] = NULL; return S_OK; } @@ -676,7 +679,7 @@ case WM_TIMER: if (wParam == TIMERID_HOTTRACK) { - m_menuBand->_OnPopupSubMenu(NULL); + m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL); PopupItem(m_hotItem); KillTimer(hWnd, TIMERID_HOTTRACK); } @@ -776,9 +779,7 @@ if (FAILED(hr)) return hr; - popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT); - - m_menuBand->_OnPopupSubMenu(popup); + m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl); return S_OK; } @@ -1037,11 +1038,12 @@ HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - HRESULT hr = m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); - if (FAILED(hr)) - return hr; - - return CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + HRESULT hr; + hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + if (FAILED(hr)) + return hr; + + return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); } HRESULT CMenuStaticToolbar::PopupItem(UINT uItem) @@ -1099,12 +1101,8 @@ HRESULT CMenuSFToolbar::FillToolbar() { HRESULT hr; - TBBUTTON tbb = { 0 }; int i = 0; PWSTR MenuString; - - tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = 0; IEnumIDList * eidl; m_shellFolder->EnumObjects(m_hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); @@ -1115,6 +1113,10 @@ { INT index = 0; INT indexOpen = 0; + + TBBUTTON tbb = { 0 }; + tbb.fsState = TBSTATE_ENABLED; + tbb.fsStyle = 0; CComPtr<IShellItem> psi; SHCreateShellItem(NULL, m_shellFolder, item, &psi); @@ -1222,9 +1224,12 @@ HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - HRESULT hr = m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); - - return CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + HRESULT hr; + hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + if (FAILED(hr)) + return hr; + + return m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); } HRESULT CMenuSFToolbar::PopupItem(UINT uItem) @@ -1299,7 +1304,7 @@ m_useBigIcons(FALSE), m_hotBar(NULL), m_hotItem(-1), - m_childMenu(NULL) + m_subMenuChild(NULL) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -1321,7 +1326,8 @@ UINT uIdAncestor, DWORD dwFlags) { - m_psmc = psmc; + if (m_psmc != psmc) + m_psmc = psmc; m_uId = uId; m_uIdAncestor = uIdAncestor; m_dwFlags = dwFlags; @@ -1446,6 +1452,10 @@ return hr; } + hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent)); + if (FAILED(hr)) + return hr; + CComPtr<IOleWindow> pTopLevelWindow; hr = IUnknown_QueryService(m_site, SID_STopLevelBrowser, IID_PPV_ARG(IOleWindow, &pTopLevelWindow)); if (FAILED(hr)) @@ -1498,7 +1508,10 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStaticY)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFldY)); - int sy = max(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); + int sy = min(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); + + int syStatic = sizeStaticY.cy; + int syShlFld = sy - syStatic; if (hwndShlFld) { @@ -1506,7 +1519,7 @@ prc->left, prc->top, prc->right - prc->left, - sizeShlFldY.cy, + syShlFld, 0); DWORD btnSize = SendMessage(hwndShlFld, TB_GETBUTTONSIZE, 0, 0); SendMessage(hwndShlFld, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); @@ -1515,9 +1528,9 @@ { SetWindowPos(hwndStatic, hwndShlFld, prc->left, - prc->top + sizeShlFldY.cy, + prc->top + syShlFld, prc->right - prc->left, - sy - sizeShlFldY.cy, + syStatic, 0); DWORD btnSize = SendMessage(hwndStatic, TB_GETBUTTONSIZE, 0, 0); SendMessage(hwndStatic, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); @@ -1572,6 +1585,9 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeStatic)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeShlFld)); + + sizeStatic.cx += 64; + sizeShlFld.cx += 64; pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx); // ignored pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; @@ -1629,7 +1645,7 @@ else hr = m_focusManager->PopMenu(this); - return hr; + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) @@ -1659,13 +1675,8 @@ HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { HRESULT hr; - CComPtr<IMenuPopup> pmp; - - hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); - if (FAILED(hr)) - return hr; - - hr = pmp->SetSubMenu(this, fActivate); + + hr = m_subMenuParent->SetSubMenu(this, fActivate); if (FAILED(hr)) return hr; @@ -1776,17 +1787,30 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) { - if (dwSelectType != MPOS_CANCELLEVEL) - { - if (dwSelectType == MPOS_SELECTLEFT) - { - dwSelectType = MPOS_CANCELLEVEL; - } - CComPtr<IMenuPopup> pmp; - HRESULT hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); - if (FAILED(hr)) - return hr; - return pmp->OnSelect(dwSelectType); + switch (dwSelectType) + { + case MPOS_CHILDTRACKING: + // TODO: Cancel timers? + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_SELECTLEFT: + if (m_subMenuChild) + m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_SELECTRIGHT: + if (m_hotBar && m_hotItem >= 0) + { + // TODO: popup the current child if it has subitems, otherwise spread up. + } + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_EXECUTE: + case MPOS_FULLCANCEL: + if (m_subMenuChild) + m_subMenuChild->OnSelect(dwSelectType); + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_CANCELLEVEL: + if (m_subMenuChild) + m_subMenuChild->OnSelect(dwSelectType); + break; } return S_FALSE; } @@ -2180,28 +2204,25 @@ } else { - CComPtr<IMenuPopup> pmp; - hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); + m_subMenuParent->OnSelect(changeType); + } + return S_OK; +} + + +HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude) +{ + if (m_subMenuChild) + { + HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); if (FAILED(hr)) return hr; - pmp->OnSelect(changeType); - } - return S_OK; -} - - -HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup) -{ - if (m_childMenu) - { - HRESULT hr = m_childMenu->OnSelect(MPOS_CANCELLEVEL); - if (FAILED(hr)) - return hr; - } - m_childMenu = popup; - if (m_childMenu) - { - return m_childMenu->SetSubMenu(this, TRUE); - } - return S_OK; -} + } + m_subMenuChild = popup; + if (popup) + { + IUnknown_SetSite(popup, m_subMenuParent); + popup->Popup(pAt, pExclude, MPPF_TOP | MPPF_RIGHT); + } + return S_OK; +} 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] Fri Feb 21 10:00:00 2014 @@ -47,11 +47,14 @@ CComPtr<IUnknown> m_Site; CComPtr<IUnknown> m_Client; CComPtr<IMenuPopup> m_SubMenuParent; + CComPtr<IMenuPopup> m_SubMenuChild; HWND m_ClientWindow; DWORD m_IconSize; HBITMAP m_Banner; + + INT m_Level; public: CMenuDeskBar(); @@ -130,6 +133,8 @@ LRESULT _OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + + HRESULT _CloseBar(); }; extern "C" @@ -150,14 +155,18 @@ return hr; } +INT deskBarCount=0; + CMenuDeskBar::CMenuDeskBar() : m_Client(NULL), - m_Banner(NULL) + m_Banner(NULL), + m_Level(deskBarCount++) { } CMenuDeskBar::~CMenuDeskBar() { + deskBarCount--; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd) @@ -316,7 +325,11 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite) { + // Windows closes the bar if this is called when the bar is shown + m_Site = pUnkSite; + + IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_SubMenuParent)); return S_OK; } @@ -468,12 +481,24 @@ int cx = rc.right; int cy = rc.bottom; - if (y < 0) - { - y = 0; - } - - // if (y+cy > work area height) cy = work area height - y + RECT rcWorkArea; + SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); + + int waHeight = rcWorkArea.bottom - rcWorkArea.top; + + if (y < rcWorkArea.top) + { + y = rcWorkArea.top; + } + + if (cy > waHeight) + { + cy = waHeight; + } + else if (y + cy > rcWorkArea.bottom) + { + y = rcWorkArea.bottom - cy; + } this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); @@ -533,70 +558,87 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( DWORD dwSelectType) { - CComPtr<IMenuPopup> pmp; - CComPtr<IDeskBarClient> dbc; - HRESULT hr; + /* As far as I can tell, the submenu hierarchy looks like this: + + The DeskBar's Child is the Band it contains. + The DeskBar's Parent is the SID_SMenuPopup of the Site. + + The Band's Child is the IMenuPopup of the child submenu. + The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). + + When the DeskBar receives a selection event: + If it requires closing the window, it will notify the Child (Band) using CancelLevel. + If it has to spread upwards (everything but CancelLevel), it will notify the Parent. + + When the Band receives a selection event, this is where it gets fuzzy: + In which cases does it call the Parent? Probably not CancelLevel. + In which cases does it call the Child? + How does it react to calls? + + */ switch (dwSelectType) { case MPOS_EXECUTE: case MPOS_FULLCANCEL: case MPOS_CANCELLEVEL: - hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IMenuPopup, &pmp)); + + _CloseBar(); + + if (dwSelectType == MPOS_CANCELLEVEL) + return S_OK; + + case MPOS_SELECTLEFT: + case MPOS_SELECTRIGHT: + case MPOS_CHILDTRACKING: + if (m_SubMenuParent) + return m_SubMenuParent->OnSelect(dwSelectType); + break; + } + + return S_OK; +} + +HRESULT CMenuDeskBar::_CloseBar() +{ + CComPtr<IDeskBarClient> dbc; + HRESULT hr; + + if (m_SubMenuChild) + { + hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL); if (FAILED(hr)) return hr; - - hr = pmp->OnSelect(MPOS_CANCELLEVEL); - if (FAILED(hr)) - return hr; - - hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); - if (FAILED(hr)) - return hr; - - hr = dbc->UIActivateDBC(FALSE); - if (FAILED(hr)) - return hr; - - SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); - - UIActivateIO(FALSE, NULL); - - if (dwSelectType == MPOS_CANCELLEVEL) - break; - - case MPOS_SELECTLEFT: - case MPOS_SELECTRIGHT: - /*CComPtr<IMenuPopup> pmp; - hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IMenuPopup, &pmp)); - if (FAILED(hr)) - return hr;*/ - - hr = m_SubMenuParent->OnSelect(dwSelectType); - if (FAILED(hr)) - return hr; - case MPOS_CHILDTRACKING: - break; - } - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu( - IMenuPopup *pmp, - BOOL fSet) -{ + } + + hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); + if (FAILED(hr)) + return hr; + + hr = dbc->UIActivateDBC(FALSE); + if (FAILED(hr)) + return hr; + + SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + + return UIActivateIO(FALSE, NULL); +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(IMenuPopup *pmp, BOOL fSet) +{ + // Called by the CHILD to notify the parent of the submenu object + if (fSet) { - m_SubMenuParent = pmp; + m_SubMenuChild = pmp; } else { - if (m_SubMenuParent) + if (m_SubMenuChild) { - if (SHIsSameObject(pmp, m_SubMenuParent)) + if (SHIsSameObject(pmp, m_SubMenuChild)) { - m_SubMenuParent = NULL; + m_SubMenuChild = NULL; } } } 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] Fri Feb 21 10:00:00 2014 @@ -180,7 +180,7 @@ HRESULT STDMETHODCALLTYPE CMenuSiteWrap::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) { - WrapLogEnter("CMenuSiteWrap<%p>::QueryBand(DWORD dwBandID=%d, IDeskBand **ppstb=%p, DWORD *pdwState=%p, LPWSTR pszName=%p, int cchName=%p)\n", this, dwBandID, ppstb, pdwState, pszName, cchName); + WrapLogEnter("CMenuSiteWrap<%p>::QueryBand(DWORD dwBandID=%d, IDeskBand **ppstb=%p, DWORD *pdwState=%p, LPWSTR pszName=%p, int cchName=%d)\n", this, dwBandID, ppstb, pdwState, pszName, cchName); HRESULT hr = m_IBandSite->QueryBand(dwBandID, ppstb, pdwState, pszName, cchName); if (ppstb) WrapLogPost("*ppstb=%p\n", *ppstb); if (pdwState) WrapLogPost("*pdwState=%d\n", *pdwState); @@ -190,7 +190,7 @@ HRESULT STDMETHODCALLTYPE CMenuSiteWrap::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) { - WrapLogEnter("CMenuSiteWrap<%p>::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv)\n", this, dwBandID, riid, ppv); + WrapLogEnter("CMenuSiteWrap<%p>::GetBandObject(DWORD dwBandID=%d, REFIID riid=%s, VOID **ppv=%p)\n", this, dwBandID, Wrap(riid), ppv); HRESULT hr = m_IBandSite->GetBandObject(dwBandID, riid, ppv); if (ppv) WrapLogPost("*ppv=%p\n", *ppv); WrapLogExit("CMenuSiteWrap::GetBandObject()", hr); @@ -201,7 +201,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::GetBandSiteInfo(BANDSITEINFO *pbsinfo=%p)\n", this, pbsinfo); HRESULT hr = m_IBandSite->GetBandSiteInfo(pbsinfo); - if (pbsinfo) WrapLogPost("*pbsinfo=%p\n", *pbsinfo); + if (pbsinfo) WrapLogPost("*pbsinfo=%s\n", Wrap(*pbsinfo)); WrapLogExit("CMenuSiteWrap::GetBandSiteInfo()", hr); return hr; } @@ -236,7 +236,6 @@ { WrapLogEnter("CMenuSiteWrap<%p>::SetDeskBarSite(IUnknown *punkSite=%p)\n", this, punkSite); HRESULT hr = m_IDeskBarClient->SetDeskBarSite(punkSite); - if (punkSite) WrapLogPost("*punkSite=%p\n", *punkSite); WrapLogExit("CMenuSiteWrap::SetDeskBarSite()", hr); return hr; }

10 years, 8 months

[aandrejevic] 62279: [FAST486] Add a macro ALIGNMENT_CHECK that checks for unaligned pointers and generates an exception.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Feb 21 01:29:13 2014 New Revision: 62279 URL: http://svn.reactos.org/svn/reactos?rev=62279&view=rev Log: [FAST486] Add a macro ALIGNMENT_CHECK that checks for unaligned pointers and generates an exception. Modified: branches/ntvdm/lib/fast486/common.h Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Fri Feb 21 01:29:13 2014 @@ -54,6 +54,15 @@ if (State->PrefixFlags & FAST486_PREFIX_ADSIZE) x = !x; #define SWAP(x, y) { (x) ^= (y); (y) ^= (x); (x) ^= (y); } + +#define ALIGNMENT_CHECK(x, a) if (State->Flags.Ac \ + && (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_AM)\ + && (State->Cpl == 3)\ + && (((x) % (a)) != 0))\ +{\ + Fast486Exception(State, FAST486_EXCEPTION_AC);\ + return FALSE;\ +} #define PAGE_ALIGN(x) ((x) & 0xFFFFF000) #define PAGE_OFFSET(x) ((x) & 0x00000FFF)

10 years, 8 months

[aandrejevic] 62278: [FAST486] Update the AC flag in the POPF instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Feb 21 01:15:03 2014 New Revision: 62278 URL: http://svn.reactos.org/svn/reactos?rev=62278&view=rev Log: [FAST486] Update the AC flag in the POPF instruction. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Feb 21 01:15:03 2014 @@ -378,8 +378,9 @@ ULONG Reserved2 : 1; ULONG Rf : 1; ULONG Vm : 1; - - // ULONG Reserved : 14; + ULONG Ac : 1; + + // ULONG Reserved : 13; }; } FAST486_FLAGS_REG, *PFAST486_FLAGS_REG; Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Feb 21 01:15:03 2014 @@ -4284,6 +4284,7 @@ State->Flags.Df = NewFlags.Df; State->Flags.Of = NewFlags.Of; State->Flags.Nt = NewFlags.Nt; + State->Flags.Ac = NewFlags.Ac; if (Cpl == 0) State->Flags.Iopl = NewFlags.Iopl; if (Cpl <= State->Flags.Iopl) State->Flags.If = NewFlags.If;

10 years, 8 months

[aandrejevic] 62277: [FAST486] Enable the Alignment Check flag. Apparently the 486 supports it.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Feb 21 01:05:47 2014 New Revision: 62277 URL: http://svn.reactos.org/svn/reactos?rev=62277&view=rev Log: [FAST486] Enable the Alignment Check flag. Apparently the 486 supports it. Modified: branches/ntvdm/lib/fast486/common.h Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Fri Feb 21 01:05:47 2014 @@ -29,8 +29,8 @@ #define SIGN_FLAG_BYTE 0x80 #define SIGN_FLAG_WORD 0x8000 #define SIGN_FLAG_LONG 0x80000000 -#define REAL_MODE_FLAGS_MASK 0x17FD5 -#define PROT_MODE_FLAGS_MASK 0x10DD5 +#define REAL_MODE_FLAGS_MASK 0x57FD5 +#define PROT_MODE_FLAGS_MASK 0x50DD5 /* Block size for string operations */ #define STRING_BLOCK_SIZE 4096

10 years, 8 months

[tkreuzer] 62276: [NTOSKRNL] Improve some DPRINTs

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 23:05:06 2014 New Revision: 62276 URL: http://svn.reactos.org/svn/reactos?rev=62276&view=rev Log: [NTOSKRNL] Improve some DPRINTs Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Feb 20 23:05:06 2014 @@ -340,7 +340,8 @@ Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", + &CCSName, Status); return Status; } @@ -348,7 +349,8 @@ Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", + ServiceName, Status); ZwClose(CCSKey); return Status; }

10 years, 8 months

[tkreuzer] 62275: [NTOSKRNL] Implement MmAdjustWorkingSetSize

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 23:03:04 2014 New Revision: 62275 URL: http://svn.reactos.org/svn/reactos?rev=62275&view=rev Log: [NTOSKRNL] Implement MmAdjustWorkingSetSize Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] Thu Feb 20 23:03:04 2014 @@ -15,6 +15,12 @@ #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" +/* GLOBALS ********************************************************************/ + +SIZE_T MmMinimumWorkingSetSize; +SIZE_T MmMaximumWorkingSetSize; +SIZE_T MmPagesAboveWsMinimum; + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -40,8 +46,111 @@ IN ULONG SystemCache, IN BOOLEAN IncreaseOkay) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + SIZE_T MinimumWorkingSetSize, MaximumWorkingSetSize; + SSIZE_T Delta; + PMMSUPPORT Ws; + NTSTATUS Status; + + /* Check for special case: empty the working set */ + if ((WorkingSetMinimumInBytes == -1) && + (WorkingSetMaximumInBytes == -1)) + { + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Get the working set and lock it */ + Ws = &PsGetCurrentProcess()->Vm; + MiLockWorkingSet(PsGetCurrentThread(), Ws); + + /* Calculate the actual minimum and maximum working set size to set */ + MinimumWorkingSetSize = (WorkingSetMinimumInBytes != 0) ? + (WorkingSetMinimumInBytes / PAGE_SIZE) : Ws->MinimumWorkingSetSize; + MaximumWorkingSetSize = (WorkingSetMaximumInBytes != 0) ? + (WorkingSetMaximumInBytes / PAGE_SIZE) : Ws->MaximumWorkingSetSize; + + /* Check if the new maximum exceeds the global maximum */ + if (MaximumWorkingSetSize > MmMaximumWorkingSetSize) + { + MaximumWorkingSetSize = MmMaximumWorkingSetSize; + Status = STATUS_WORKING_SET_LIMIT_RANGE; + } + + /* Check if the new minimum is below the global minimum */ + if (MinimumWorkingSetSize < MmMinimumWorkingSetSize) + { + MinimumWorkingSetSize = MmMinimumWorkingSetSize; + Status = STATUS_WORKING_SET_LIMIT_RANGE; + } + + /* Check if the new minimum exceeds the new maximum */ + if (MinimumWorkingSetSize > MaximumWorkingSetSize) + { + DPRINT1("MinimumWorkingSetSize > MaximumWorkingSetSize\n"); + Status = STATUS_BAD_WORKING_SET_LIMIT; + goto Cleanup; + } + + /* Calculate the minimum WS size adjustment and check if we increase */ + Delta = MinimumWorkingSetSize - Ws->MinimumWorkingSetSize; + if (Delta > 0) + { + /* Is increasing ok? */ + if (!IncreaseOkay) + { + DPRINT1("Privilege for WS size increase not held\n"); + Status = STATUS_PRIVILEGE_NOT_HELD; + goto Cleanup; + } + + /* Check if the number of available pages is large enough */ + if (((SIZE_T)Delta / 1024) > (MmAvailablePages - 128)) + { + DPRINT1("Not enough available pages\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Check if there are enough resident available pages */ + if ((SIZE_T)Delta > + (MmResidentAvailablePages - MmSystemLockPagesCount - 256)) + { + DPRINT1("Not enough resident pages\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + } + + /* Update resident available pages */ + if (Delta != 0) + { + InterlockedExchangeAddSizeT(&MmResidentAvailablePages, -Delta); + } + + /* Calculate new pages above minimum WS size */ + Delta += max((SSIZE_T)Ws->WorkingSetSize - MinimumWorkingSetSize, 0); + + /* Subtract old pages above minimum WS size */ + Delta -= max((SSIZE_T)Ws->WorkingSetSize - Ws->MinimumWorkingSetSize, 0); + + /* If it changed, add it to the global variable */ + if (Delta != 0) + { + InterlockedExchangeAddSizeT(&MmPagesAboveWsMinimum, Delta); + } + + /* Set the new working set size */ + Ws->MinimumWorkingSetSize = MinimumWorkingSetSize; + Ws->MaximumWorkingSetSize = MaximumWorkingSetSize; + +Cleanup: + + /* Unlock the working set and return the status */ + MiUnlockWorkingSet(PsGetCurrentThread(), Ws); + return Status; } /*

10 years, 8 months

[ekohl] 62274: [MSGINA] CORE-7559 Implement the shutdown dialog. Based on a patch by Lee Schroeder. Thank you very much!

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Feb 20 22:00:30 2014 New Revision: 62274 URL: http://svn.reactos.org/svn/reactos?rev=62274&view=rev Log: [MSGINA] CORE-7559 Implement the shutdown dialog. Based on a patch by Lee Schroeder. Thank you very much! Added: trunk/reactos/dll/win32/msgina/resources/shutdown.ico (with props) 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/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/msgina.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] Thu Feb 20 22:00:30 2014 @@ -592,6 +592,219 @@ } +static +VOID +UpdateShutdownDesc( + IN HWND hwnd) +{ + WCHAR szBuffer[256]; + UINT shutdownDescId = 0; + int shutdownCode = 0; + + shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); + + switch (shutdownCode) + { + case 0: /* Log off */ + shutdownDescId = IDS_SHUTDOWN_LOGOFF_DESC; + break; + + case 1: /* Shut down */ + shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC; + break; + + case 2: /* Restart */ + shutdownDescId = IDS_SHUTDOWN_RESTART_DESC; + break; + + case 3: /* Sleep */ + shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; + break; + + case 4: /* Hibernate */ + shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC; + break; + + default: + break; + } + + LoadStringW(hDllInstance, shutdownDescId, szBuffer, sizeof(szBuffer)); + SetDlgItemTextW(hwnd, IDC_SHUTDOWN_DESCRIPTION, szBuffer); +} + + +static +VOID +ShutDownOnInit( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + WCHAR szBuffer[256]; + HWND hwndList; + INT idx, count, i; + + hwndList = GetDlgItem(hwndDlg, IDC_SHUTDOWN_LIST); + + /* Clears the content before it's used */ + SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); + + /* Log off */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF); + + /* Shut down */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + + /* Restart */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + + /* Sleep */ +#if 0 + LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_SLEEP); +#endif + + /* Hibernate */ +#if 0 + LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_HIBERNATE); +#endif + + /* Sets the default shut down selection */ + count = SendMessageW(hwndList, CB_GETCOUNT, 0, 0); + for (i = 0; i < count; i++) + { + if (pgContext->nShutdownAction == SendMessageW(hwndList, CB_GETITEMDATA, i, 0)) + { + SendMessageW(hwndList, CB_SETCURSEL, i, 0); + break; + } + } + + /* Updates the choice description based on the current selection */ + UpdateShutdownDesc(hwndDlg); +} + + +static +VOID +ShutDownOnOk( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + INT idx; + + idx = SendDlgItemMessageW(hwndDlg, + IDC_SHUTDOWN_LIST, + CB_GETCURSEL, + 0, + 0); + if (idx != CB_ERR) + { + pgContext->nShutdownAction = SendDlgItemMessageW(hwndDlg, + IDC_SHUTDOWN_LIST, + CB_GETITEMDATA, + idx, + 0); + } +} + + +BOOL +CALLBACK +ShutDownDialogProc( + HWND hwnd, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwnd, GWL_USERDATA); + + switch (Message) + { + case WM_INITDIALOG: + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwnd, GWL_USERDATA, (INT_PTR)pgContext); + + ShutDownOnInit(hwnd, pgContext); + + /* Draw the logo graphic */ + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + return TRUE; + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + if (pgContext->hBitmap) + { + hdc = BeginPaint(hwnd, &ps); + DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hwnd, &ps); + } + return TRUE; + } + + case WM_DESTROY: + DeleteObject(pgContext->hBitmap); + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + ShutDownOnOk(hwnd, pgContext); + EndDialog(hwnd, IDOK); + break; + + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + + case IDC_SHUTDOWN_LIST: + UpdateShutdownDesc(hwnd); + break; + } + break; + + default: + return FALSE; + } + return TRUE; +} + + +static +INT +OnShutDown( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + return pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG), + hwndDlg, + ShutDownDialogProc, + (LPARAM)pgContext); +} + + static INT_PTR CALLBACK LoggedOnWindowProc( IN HWND hwndDlg, @@ -627,7 +840,8 @@ EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); return TRUE; case IDC_SHUTDOWN: - EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + if (OnShutDown(hwndDlg, pgContext) == IDOK) + EndDialog(hwndDlg, pgContext->nShutdownAction); return TRUE; case IDC_CHANGEPWD: if (OnChangePassword(hwndDlg, pgContext)) 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] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐÐ°ÐºÐ²Ð¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ´ÑÐ°Ð²ÐµÐ¹ÑÐµ!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -119,6 +119,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Vypnout ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Co mÃ¡ poÄÃtaÄ provÃ©st?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Storno", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "VÃtejte!" @@ -137,3 +151,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "Nein", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOS herunterfahren" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Welcher Vorgang soll durchgefÃ¼hrt werden?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Abbrechen", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Willkommen!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "Die eingegebenen Passworte stimmen nicht Ã¼berein. Geben Sie das neue Passwort in beide Textfelder ein." IDS_PASSWORDCHANGED "Ihr Passwort wurde geÃ¤ndert." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Welcome!" @@ -132,3 +146,20 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Apagar ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "Â¿&Que quieres que haga el equipo?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Aceptar", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Â¡Bienvenido!" @@ -134,3 +148,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Fermer ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Annuler", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "××¨×××× ×××××!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Selamat datang!" @@ -131,3 +145,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -122,6 +122,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Spegnimento di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Annulla", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Benvenuti!" @@ -140,3 +154,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -86,7 +86,7 @@ IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" -FONT 8, "MS Shell Dlg", 400, 0, 1 +FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8 @@ -106,12 +106,26 @@ IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" -FONT 8, "MS Shell Dlg", 400, 0, 1 +FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN ICON IDI_LOCKICON, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOSã®ã·ã£ãããã¦ã³" +FONT 9,"MS UI Gothic", 400, 0, 1 +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ã³ã³ãã¥ã¼ã¿ã®åä½ãé¸æãã¦ãã ãã", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 204, 122, 55, 14 END STRINGTABLE @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "SlÃ¥ av ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Hva vil du at datamaskinen skal gjÃ¸re?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Avbryt", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Velkommen!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -123,6 +123,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Zamknij ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Co chcesz, aby zrobiÅ komputer?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Witaj!" @@ -141,3 +155,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "N&u", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ãnchidere ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Ce doriÈi sÄ se Ã®ntÃ¢mple?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bun venit!" @@ -134,3 +148,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ.", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ!" @@ -134,3 +148,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -119,6 +119,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Vypnutie systÃ©mu ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Äo chcete aby poÄÃtaÄ urobil?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Vitajte!" @@ -137,3 +151,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -117,6 +117,20 @@ PUSHBUTTON "Jo", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "MirÃ«seerdhÃ«t!" @@ -132,3 +146,19 @@ 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." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "HayÄ±r", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Oturumu Kapat" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&BilgisayarÄ±nÄ±zÄ±n ne yapmasÄ±nÄ± istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Tamam", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Ä°ptal", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "HoÅgeldiniz!" @@ -134,3 +148,19 @@ 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." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END 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] Thu Feb 20 22:00:30 2014 @@ -122,6 +122,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐÐ¸Ð±ÐµÑÑÑÑ Ð¾Ð´Ð½Ñ Ð· ÑÐ°ÐºÐ¸Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÐµÐ¹?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾!" @@ -140,3 +154,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -312,6 +312,8 @@ /* Check autologon settings the first time */ pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY; + + pgContext->nShutdownAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; ChooseGinaUI(); return pGinaUI->Initialize(pgContext); Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -38,6 +38,8 @@ BOOL bAutoAdminLogon; BOOL bDontDisplayLastUserName; BOOL bShutdownWithoutLogon; + + INT nShutdownAction; /* Information to be filled during logon */ WCHAR UserName[256]; Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -11,6 +11,7 @@ IDI_ROSLOGO BITMAP "resources/reactos.bmp" IDI_LOCKICON ICON "resources/21.ico" +IDI_SHELL_SHUTDOWN ICON "resources/shutdown.ico" /* UTF-8 */ #pragma code_page(65001) 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] Thu Feb 20 22:00:30 2014 @@ -7,20 +7,23 @@ #define IDD_LOGGEDOUT_DLG 103 #define IDD_LOCKED_DLG 104 #define IDD_UNLOCK_DLG 105 +#define IDD_SHUTDOWN_DLG 108 -#define IDC_LOGOFF 1001 -#define IDC_USERNAME 1002 -#define IDC_PASSWORD 1003 -#define IDC_SHUTDOWN 1004 -#define IDC_STATUSLABEL 1005 -#define IDC_LOCK 1006 -#define IDC_ROSLOGO 1007 -#define IDC_TASKMGR 1008 -#define IDC_LOCKMSG 1009 -#define IDC_LOGONMSG 1010 -#define IDC_LOGONDATE 1011 -#define IDC_CHANGEPWD 1012 -#define IDC_LOGON_TO 1013 +#define IDC_LOGOFF 1001 +#define IDC_USERNAME 1002 +#define IDC_PASSWORD 1003 +#define IDC_SHUTDOWN 1004 +#define IDC_STATUSLABEL 1005 +#define IDC_LOCK 1006 +#define IDC_ROSLOGO 1007 +#define IDC_TASKMGR 1008 +#define IDC_LOCKMSG 1009 +#define IDC_LOGONMSG 1010 +#define IDC_LOGONDATE 1011 +#define IDC_CHANGEPWD 1012 +#define IDC_LOGON_TO 1013 +#define IDC_SHUTDOWN_LIST 1014 +#define IDC_SHUTDOWN_DESCRIPTION 1015 #define IDD_CHANGE_PASSWORD 106 #define IDC_CHANGEPWD_USERNAME 1013 @@ -31,7 +34,8 @@ #define IDD_LOGOFF_DLG 107 -#define IDI_ROSLOGO 20000 +#define IDI_ROSLOGO 20000 +#define IDI_SHELL_SHUTDOWN 20001 #define IDI_LOCKICON 21 @@ -50,3 +54,15 @@ #define IDS_CHANGEPWDTITLE 40012 #define IDS_NONMATCHINGPASSWORDS 40013 #define IDS_PASSWORDCHANGED 40014 + +#define IDS_SHUTDOWN_SHUTDOWN 50000 +#define IDS_SHUTDOWN_LOGOFF 50001 +#define IDS_SHUTDOWN_RESTART 50002 +#define IDS_SHUTDOWN_SLEEP 50003 +#define IDS_SHUTDOWN_HIBERNATE 50004 +/* Shut down descriptions */ +#define IDS_SHUTDOWN_SHUTDOWN_DESC 50005 +#define IDS_SHUTDOWN_LOGOFF_DESC 50006 +#define IDS_SHUTDOWN_RESTART_DESC 50007 +#define IDS_SHUTDOWN_SLEEP_DESC 50008 +#define IDS_SHUTDOWN_HIBERNATE_DESC 50009 Added: trunk/reactos/dll/win32/msgina/resources/shutdown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msgina/resources/shutdown.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

10 years, 8 months

[tkreuzer] 62273: [AFD] Fix potentially uninitialized variable.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 21:47:02 2014 New Revision: 62273 URL: http://svn.reactos.org/svn/reactos?rev=62273&view=rev Log: [AFD] Fix potentially uninitialized variable. Modified: trunk/reactos/drivers/network/afd/afd/bind.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Thu Feb 20 21:47:02 2014 @@ -77,7 +77,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_BIND_DATA BindReq; - HANDLE UserHandle; + HANDLE UserHandle = NULL; UNREFERENCED_PARAMETER(DeviceObject); @@ -101,7 +101,6 @@ if (NT_SUCCESS(Status)) { - UserHandle = NULL; Status = ObOpenObjectByPointer(FCB->AddressFile.Object, 0, NULL,

10 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
47
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 February 2014