Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 72102: [NtUser] - Fix regression from r66350. See CORE-11324 for more details.
by jimtabor＠svn.reactos.org 03 Aug '16

03 Aug '16

Author: jimtabor Date: Wed Aug 3 17:41:22 2016 New Revision: 72102 URL: http://svn.reactos.org/svn/reactos?rev=72102&view=rev Log: [NtUser] - Fix regression from r66350. See CORE-11324 for more details. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Wed Aug 3 17:41:22 2016 @@ -1759,7 +1759,7 @@ RECTL CopyRect; PWND Ancestor; BOOL bPointerInWindow; - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + //PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); ASSERT_REFS_CO(Window); @@ -2126,6 +2126,7 @@ { co_IntSendMessageNoWait(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0); } +#if 0 ////// Break see CORE-11324 /* Do not allow setting if already active. Fix A : wine msg test_SetParent:WmSetParentSeq_2:25 msg! Recursion broke the tests. @@ -2142,6 +2143,16 @@ co_IntSetForegroundWindow(Window); } } +#else ////// + else + { + //ERR("SetWindowPos Set FG Window!\n"); + if (Window->state & WNDS_BEINGACTIVATED) // Inside SAW? + co_IntSetActiveWindow(Window, FALSE, TRUE, FALSE); // Fixes Api AttachThreadInput tests. + else + co_IntSetForegroundWindow(Window); // Fixes SW_HIDE issues. Wine win test_SetActiveWindow & test_SetForegroundWindow. + } +#endif } // Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED. @@ -2449,7 +2460,8 @@ ((Cmd == SW_SHOW) || (Cmd == SW_NORMAL))) { ERR("WinPosShowWindow Set active\n"); - UserSetActiveWindow(Wnd); + //UserSetActiveWindow(Wnd); + co_IntSetForegroundWindow(Wnd); // HACK Swp |= SWP_NOACTIVATE | SWP_NOZORDER; } #endif

1 0

[tfaber] 72101: [NTOS:SE] - Remove unnecessary null checks & fix up cleanup in SepCreateToken and SepDuplicateToken. Based on a patch by Víctor Martínez Calvo CORE-11768 #resolve
by tfaber＠svn.reactos.org 03 Aug '16

03 Aug '16

Author: tfaber Date: Wed Aug 3 17:10:59 2016 New Revision: 72101 URL: http://svn.reactos.org/svn/reactos?rev=72101&view=rev Log: [NTOS:SE] - Remove unnecessary null checks & fix up cleanup in SepCreateToken and SepDuplicateToken. Based on a patch by Víctor Martínez Calvo CORE-11768 #resolve Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Aug 3 17:10:59 2016 @@ -373,7 +373,7 @@ ULONG uLength; ULONG i; PVOID EndMem; - PTOKEN AccessToken = NULL; + PTOKEN AccessToken; NTSTATUS Status; PAGED_CODE(); @@ -400,9 +400,12 @@ AccessToken->TokenLock = &SepTokenLock; + /* Copy and reference the logon session */ + RtlCopyLuid(&AccessToken->AuthenticationId, &Token->AuthenticationId); + SepRmReferenceLogonSession(&AccessToken->AuthenticationId); + AccessToken->TokenType = TokenType; AccessToken->ImpersonationLevel = Level; - RtlCopyLuid(&AccessToken->AuthenticationId, &Token->AuthenticationId); RtlCopyLuid(&AccessToken->ModifiedId, &Token->ModifiedId); AccessToken->TokenSource.SourceIdentifier.LowPart = Token->TokenSource.SourceIdentifier.LowPart; @@ -483,25 +486,11 @@ *NewAccessToken = AccessToken; - /* Reference the logon session */ - SepRmReferenceLogonSession(&AccessToken->AuthenticationId); - done: if (!NT_SUCCESS(Status)) { - if (AccessToken) - { - if (AccessToken->UserAndGroups) - ExFreePoolWithTag(AccessToken->UserAndGroups, TAG_TOKEN_USERS); - - if (AccessToken->Privileges) - ExFreePoolWithTag(AccessToken->Privileges, TAG_TOKEN_PRIVILAGES); - - if (AccessToken->DefaultDacl) - ExFreePoolWithTag(AccessToken->DefaultDacl, TAG_TOKEN_ACL); - - ObDereferenceObject(AccessToken); - } + /* Dereference the token, the delete procedure will clean up */ + ObDereferenceObject(AccessToken); } return Status; @@ -759,8 +748,11 @@ TokenSource->SourceName, sizeof(TokenSource->SourceName)); + /* Copy and reference the logon session */ + RtlCopyLuid(&AccessToken->AuthenticationId, AuthenticationId); + SepRmReferenceLogonSession(&AccessToken->AuthenticationId); + RtlCopyLuid(&AccessToken->TokenId, &TokenId); - RtlCopyLuid(&AccessToken->AuthenticationId, AuthenticationId); AccessToken->ExpirationTime = *ExpirationTime; RtlCopyLuid(&AccessToken->ModifiedId, &ModifiedId); @@ -899,17 +891,11 @@ *TokenHandle = (HANDLE)AccessToken; } - /* Reference the logon session */ - SepRmReferenceLogonSession(AuthenticationId); - done: if (!NT_SUCCESS(Status)) { - if (AccessToken) - { - /* Dereference the token, the delete procedure will clean up */ - ObDereferenceObject(AccessToken); - } + /* Dereference the token, the delete procedure will clean up */ + ObDereferenceObject(AccessToken); } return Status; @@ -1091,7 +1077,7 @@ DPRINT1("SeQueryInformationToken(%d) invalid information class\n", TokenInformationClass); return STATUS_INVALID_INFO_CLASS; } - + switch (TokenInformationClass) { case TokenImpersonationLevel:

1 0

[gadamopoulos] 72100: Fix gcc build
by gadamopoulos＠svn.reactos.org 03 Aug '16

03 Aug '16

Author: gadamopoulos Date: Wed Aug 3 15:55:58 2016 New Revision: 72100 URL: http://svn.reactos.org/svn/reactos?rev=72100&view=rev Log: Fix gcc build Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Wed Aug 3 15:55:58 2016 @@ -96,8 +96,8 @@ }; CDesktopBrowser::CDesktopBrowser(): - m_hWndShellView(NULL), - m_hAccel(NULL) + m_hAccel(NULL), + m_hWndShellView(NULL) { }

1 0

[gadamopoulos] 72099: [SHELL32] - CDesktopBrowser: Convert to an ATL CWindow class, remove unused fields and cleanup.
by gadamopoulos＠svn.reactos.org 03 Aug '16

03 Aug '16

Author: gadamopoulos Date: Wed Aug 3 15:52:27 2016 New Revision: 72099 URL: http://svn.reactos.org/svn/reactos?rev=72099&view=rev Log: [SHELL32] - CDesktopBrowser: Convert to an ATL CWindow class, remove unused fields and cleanup. Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Wed Aug 3 15:52:27 2016 @@ -22,42 +22,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(desktop); -#define SHDESK_TAG 'KSED' - static const WCHAR szProgmanClassName[] = L"Progman"; static const WCHAR szProgmanWindowName[] = L"Program Manager"; class CDesktopBrowser : + public CWindowImpl<CDesktopBrowser, CWindow, CFrameWinTraits>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellBrowser, - public ICommDlgBrowser, public IServiceProvider { -public: - DWORD Tag; +private: HACCEL m_hAccel; -private: - HWND hWnd; - HWND hWndShellView; - HWND hWndDesktopListView; // FIXME: Unused - CComPtr<IShellDesktopTray> ShellDesk; - CComPtr<IShellView> DesktopView; - CComPtr<IShellBrowser> DefaultShellBrowser; - LPITEMIDLIST pidlDesktopDirectory; - LPITEMIDLIST pidlDesktop; + HWND m_hWndShellView; + CComPtr<IShellDesktopTray> m_Tray; + CComPtr<IShellView> m_ShellView; LRESULT _NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam); public: CDesktopBrowser(); ~CDesktopBrowser(); - HRESULT Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx); - HWND FindDesktopListView(); - BOOL CreateDeskWnd(); - HWND DesktopGetWindowControl(IN UINT id); - LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT CALLBACK ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam); - BOOL MessageLoop(); + HRESULT Initialize(IShellDesktopTray *ShellDeskx); // *** IOleWindow methods *** virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); @@ -78,128 +63,96 @@ virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(struct IShellView *ppshv); virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags); - // *** ICommDlgBrowser methods *** - virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand (struct IShellView *ppshv); - virtual HRESULT STDMETHODCALLTYPE OnStateChange (struct IShellView *ppshv, ULONG uChange); - virtual HRESULT STDMETHODCALLTYPE IncludeObject (struct IShellView *ppshv, LPCITEMIDLIST pidl); - // *** IServiceProvider methods *** virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // message handlers + LRESULT OnEraseBkgnd(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnOpenNewWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + +DECLARE_WND_CLASS_EX(szProgmanClassName, CS_DBLCLKS, COLOR_DESKTOP) + +BEGIN_MSG_MAP(CBaseBar) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSettingChange) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + MESSAGE_HANDLER(WM_EXPLORER_OPEN_NEW_WINDOW, OnOpenNewWindow) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) +END_MSG_MAP() BEGIN_COM_MAP(CDesktopBrowser) COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) - COM_INTERFACE_ENTRY_IID(IID_ICommDlgBrowser, ICommDlgBrowser) COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) END_COM_MAP() }; -CDesktopBrowser::CDesktopBrowser() -{ - Tag = SHDESK_TAG; - hWnd = NULL; - hWndShellView = NULL; - hWndDesktopListView = NULL; - DefaultShellBrowser = NULL; - pidlDesktopDirectory = NULL; - pidlDesktop = NULL; +CDesktopBrowser::CDesktopBrowser(): + m_hWndShellView(NULL), + m_hAccel(NULL) +{ } CDesktopBrowser::~CDesktopBrowser() { - if (DesktopView.p != NULL) - { - if (hWndShellView != NULL) - DesktopView->DestroyViewWindow(); - - hWndShellView = NULL; - hWndDesktopListView = NULL; - } - - if (pidlDesktopDirectory != NULL) - { - ILFree(pidlDesktopDirectory); - pidlDesktopDirectory = NULL; - } - - if (pidlDesktop != NULL) - { - ILFree(pidlDesktop); - pidlDesktop = NULL; - } -} - -HRESULT CDesktopBrowser::Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx) -{ - CComPtr<IShellFolder> psfDesktopFolder; - CSFV csfv; + if (m_ShellView.p != NULL && m_hWndShellView != NULL) + { + m_ShellView->DestroyViewWindow(); + } +} + +HRESULT CDesktopBrowser::Initialize(IShellDesktopTray *ShellDesk) +{ + CComPtr<IShellFolder> psfDesktop; HRESULT hRet; - - hWnd = hWndx; - ShellDesk = ShellDeskx; - ShellDesk->AddRef(); - - pidlDesktopDirectory = SHCloneSpecialIDList(hWnd, CSIDL_DESKTOPDIRECTORY, FALSE); - hRet = SHGetSpecialFolderLocation(hWnd, CSIDL_DESKTOP, &pidlDesktop); - if (FAILED(hRet)) + hRet = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - hRet = SHGetDesktopFolder(&psfDesktopFolder); - if (FAILED(hRet)) + /* Calculate the size and pos of the window */ + RECT rect; + if (!GetSystemMetrics(SM_CXVIRTUALSCREEN) || GetSystemMetrics(SM_CYVIRTUALSCREEN)) + { + SetRect(&rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + } + else + { + SetRect(&rect, + GetSystemMetrics(SM_XVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + } + + + m_Tray = ShellDesk; + + Create(NULL, &rect, szProgmanWindowName, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, WS_EX_TOOLWINDOW); + if (!m_hWnd) + return E_FAIL; + + CSFV csfv = {sizeof(CSFV), psfDesktop}; + hRet = SHCreateShellFolderViewEx(&csfv, &m_ShellView); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - ZeroMemory(&csfv, sizeof(csfv)); - csfv.cbSize = sizeof(csfv); - csfv.pshf = psfDesktopFolder; - csfv.psvOuter = NULL; - - hRet = SHCreateShellFolderViewEx(&csfv, &DesktopView); - - return hRet; -} - -static CDesktopBrowser *SHDESK_Create(HWND hWnd, LPCREATESTRUCT lpCreateStruct) -{ - CComPtr<IShellDesktopTray> ShellDesk; - CComObject<CDesktopBrowser> *pThis; - HRESULT hRet; - - ShellDesk = (IShellDesktopTray *)lpCreateStruct->lpCreateParams; - if (ShellDesk == NULL) - { - WARN("No IShellDesk interface provided!"); - return NULL; - } - - pThis = new CComObject<CDesktopBrowser>; - - pThis->AddRef(); - - hRet = pThis->Initialize(hWnd, ShellDesk); - if (FAILED(hRet)) - { - pThis->Release(); - delete pThis; - return NULL; - } - - return pThis; -} - -HWND CDesktopBrowser::FindDesktopListView() -{ - return FindWindowExW(hWndShellView, NULL, WC_LISTVIEW, NULL); -} - -BOOL CDesktopBrowser::CreateDeskWnd() -{ + m_Tray->RegisterDesktopWindow(m_hWnd); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + FOLDERSETTINGS fs; RECT rcWorkArea; - HRESULT hRet; // FIXME: Add support for multi-monitor? - SystemParametersInfoW(SPI_GETWORKAREA, - 0, &rcWorkArea, 0); + SystemParametersInfoW(SPI_GETWORKAREA, 0, &rcWorkArea, 0); // TODO: Call GetClientRect for the tray window and make small computation // to be sure the tray window rect is removed from the work area! @@ -208,38 +161,39 @@ HWND hWndTray; /* Get client rect of the taskbar */ - hRet = ShellDesk->GetTrayWindow(&hWndTray); + hRet = m_Tray->GetTrayWindow(&hWndTray); if (SUCCEEDED(hRet)) GetClientRect(hWndTray, &rcTray); #endif fs.ViewMode = FVM_ICON; fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; - hRet = DesktopView->CreateViewWindow(NULL, &fs, (IShellBrowser *)this, &rcWorkArea, &hWndShellView); - if (!SUCCEEDED(hRet)) - return FALSE; - - SetShellWindowEx(hWnd, FindDesktopListView()); + hRet = m_ShellView->CreateViewWindow(NULL, &fs, (IShellBrowser *)this, &rcWorkArea, &m_hWndShellView); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + + HWND hwndListView = FindWindowExW(m_hWndShellView, NULL, WC_LISTVIEW, NULL); + SetShellWindowEx(m_hWnd, hwndListView); + + m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_DESKBROWSER)); #if 1 /* A Windows8+ specific hack */ - ::ShowWindow(hWndShellView, SW_SHOW); - ::ShowWindow(FindDesktopListView(), SW_SHOW); + ::ShowWindow(m_hWndShellView, SW_SHOW); + ::ShowWindow(hwndListView, SW_SHOW); #endif - - return TRUE; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetWindow(HWND *phwnd) -{ - if (hWnd != NULL) - { - *phwnd = hWnd; - return S_OK; - } - - *phwnd = NULL; - return E_UNEXPECTED; + ShowWindow(SW_SHOW); + UpdateWindow(); + + return hRet; +} + +HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetWindow(HWND *lphwnd) +{ + if (lphwnd == NULL) + return E_POINTER; + *lphwnd = m_hWnd; + return S_OK; } HRESULT STDMETHODCALLTYPE CDesktopBrowser::ContextSensitiveHelp(BOOL fEnterMode) @@ -274,7 +228,7 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::TranslateAcceleratorSB(LPMSG lpmsg, WORD wID) { - if (!::TranslateAcceleratorW(hWnd, m_hAccel, lpmsg)) + if (!::TranslateAcceleratorW(m_hWnd, m_hAccel, lpmsg)) return S_FALSE; return S_OK; } @@ -294,62 +248,27 @@ return E_NOTIMPL; } -HWND CDesktopBrowser::DesktopGetWindowControl(IN UINT id) -{ - switch (id) - { - case FCW_TOOLBAR: - case FCW_STATUS: - case FCW_TREE: - case FCW_PROGRESS: - return NULL; - - default: - return NULL; - } - -} - HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetControlWindow(UINT id, HWND *lphwnd) { - HWND hWnd; - - hWnd = DesktopGetWindowControl(id); - if (hWnd != NULL) - { - *lphwnd = hWnd; - return S_OK; - } - - *lphwnd = NULL; + if (lphwnd == NULL) + return E_POINTER; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CDesktopBrowser::SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) { - HWND hWnd; - if (pret == NULL) return E_POINTER; - - hWnd = DesktopGetWindowControl(id); - if (hWnd != NULL) - { - *pret = SendMessageW(hWnd, - uMsg, - wParam, - lParam); - return S_OK; - } - return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryActiveShellView(IShellView **ppshv) { - *ppshv = DesktopView; - if (DesktopView != NULL) - DesktopView->AddRef(); + if (ppshv == NULL) + return E_POINTER; + *ppshv = m_ShellView; + if (m_ShellView != NULL) + m_ShellView->AddRef(); return S_OK; } @@ -362,21 +281,6 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags) { return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnDefaultCommand(IShellView *ppshv) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnStateChange(IShellView *ppshv, ULONG uChange) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::IncludeObject(IShellView *ppshv, LPCITEMIDLIST pidl) -{ - return S_OK; } HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryService(REFGUID guidService, REFIID riid, PVOID *ppv) @@ -385,40 +289,19 @@ return QueryInterface(riid, ppv); } -BOOL CDesktopBrowser::MessageLoop() -{ - MSG Msg; - BOOL bRet; - - while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0) - { - if (bRet != -1) - { - if (DesktopView->TranslateAcceleratorW(&Msg) != S_OK) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - } - } - - return TRUE; -} - LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND hWndTray; HRESULT hRet; - hRet = ShellDesk->GetTrayWindow(&hWndTray); - + hRet = m_Tray->GetTrayWindow(&hWndTray); if (SUCCEEDED(hRet)) - PostMessageW(hWndTray, uMsg, wParam, lParam); - - return 0; -} - -LRESULT CDesktopBrowser::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam) + ::PostMessageW(hWndTray, uMsg, wParam, lParam); + + return 0; +} + +LRESULT CDesktopBrowser::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { switch (LOWORD(wParam)) { @@ -439,217 +322,102 @@ return 0; } -LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) -{ - CDesktopBrowser *pThis = NULL; - LRESULT Ret = FALSE; - - if (uMsg != WM_NCCREATE) - { - pThis = reinterpret_cast<CDesktopBrowser *>(GetWindowLongPtrW(hwnd, 0)); - if (pThis == NULL) - goto DefMsgHandler; - } - - if (pThis != NULL || uMsg == WM_NCCREATE) - { - switch (uMsg) - { - case WM_ERASEBKGND: - return (LRESULT)PaintDesktop((HDC)wParam); - - case WM_GETISHELLBROWSER: - Ret = (LRESULT)((IShellBrowser *)pThis); - break; - - case WM_SIZE: - { - if (wParam == SIZE_MINIMIZED) - { - /* Hey, we're the desktop!!! */ - ShowWindow(hwnd, SW_RESTORE); - } - else - { - RECT rcDesktop; - - rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); - - /* FIXME: Update work area */ - DBG_UNREFERENCED_LOCAL_VARIABLE(rcDesktop); - } - break; - } - - case WM_SYSCOLORCHANGE: - case WM_SETTINGCHANGE: - { - if (pThis->hWndShellView != NULL) - { - /* Forward the message */ - SendMessageW(pThis->hWndShellView, - uMsg, - wParam, - lParam); - } - - if (uMsg == WM_SETTINGCHANGE && wParam == SPI_SETWORKAREA && - pThis->hWndShellView != NULL) - { - RECT rcWorkArea; - - // FIXME: Add support for multi-monitor! - // FIXME: Maybe merge with the code that retrieves the - // work area in CDesktopBrowser::CreateDeskWnd ? - SystemParametersInfoW(SPI_GETWORKAREA, - 0, &rcWorkArea, 0); - - SetWindowPos(pThis->hWndShellView, NULL, - rcWorkArea.left, rcWorkArea.top, - rcWorkArea.right - rcWorkArea.left, - rcWorkArea.bottom - rcWorkArea.top, - SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER); - } - break; - } - - case WM_CREATE: - { - pThis->ShellDesk->RegisterDesktopWindow(pThis->hWnd); - - if (!pThis->CreateDeskWnd()) - WARN("Could not create the desktop view control!\n"); - - pThis->m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_DESKBROWSER)); - - break; - } - - case WM_NCCREATE: - { - LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam; - - // FIXME: This is a "hack" to enforce the window title - // to be set to what it should be *on Windows* only. - // I don't understand why it is reset to NULL whereas - // the creation of the progman window proper is done in - // the standard way... (05/06/2016, hbelusca). - // - ::SetWindowTextW(hwnd, CreateStruct->lpszName); - - pThis = SHDESK_Create(hwnd, CreateStruct); - if (pThis == NULL) - { - WARN("Failed to create desktop structure\n"); - break; - } - - SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pThis); - Ret = TRUE; - break; - } - - case WM_NCDESTROY: - { - pThis->Release(); - break; - } - - case WM_CLOSE: - return pThis->_NotifyTray(TWM_DOEXITWINDOWS, 0, 0); - - case WM_EXPLORER_OPEN_NEW_WINDOW: - TRACE("Proxy Desktop message 1035 received.\n"); - SHOnCWMCommandLine((HANDLE)lParam); - break; - - case WM_COMMAND: - return pThis->OnCommand(uMsg, wParam, lParam); - - case WM_SETFOCUS: - SetFocus(pThis->hWndShellView); - break; - - default: -DefMsgHandler: - Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); - break; - } - } - - return Ret; -} - -static BOOL -RegisterProgmanWindowClass(VOID) -{ - WNDCLASSW wcProgman; - - wcProgman.style = CS_DBLCLKS; - wcProgman.lpfnWndProc = CDesktopBrowser::ProgmanWindowProc; - wcProgman.cbClsExtra = 0; - wcProgman.cbWndExtra = sizeof(CDesktopBrowser *); - wcProgman.hInstance = shell32_hInstance; - wcProgman.hIcon = NULL; - wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = (HBRUSH)(COLOR_DESKTOP + 1); - wcProgman.lpszMenuName = NULL; - wcProgman.lpszClassName = szProgmanClassName; - - return RegisterClassW(&wcProgman) != 0; -} - + +LRESULT CDesktopBrowser::OnEraseBkgnd(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + return (LRESULT)PaintDesktop((HDC)wParam); +} + +LRESULT CDesktopBrowser::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (wParam == SIZE_MINIMIZED) + { + /* Hey, we're the desktop!!! */ + ::ShowWindow(m_hWnd, SW_RESTORE); + } + else + { + RECT rcDesktop; + rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); + + /* FIXME: Update work area */ + DBG_UNREFERENCED_LOCAL_VARIABLE(rcDesktop); + } + + return 0; +} + +LRESULT CDesktopBrowser::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (m_hWndShellView) + { + /* Forward the message */ + SendMessageW(m_hWndShellView, uMsg, wParam, lParam); + } + + if (uMsg == WM_SETTINGCHANGE && wParam == SPI_SETWORKAREA && + m_hWndShellView != NULL) + { + RECT rcWorkArea; + + // FIXME: Add support for multi-monitor! + // FIXME: Maybe merge with the code that retrieves the + // work area in CDesktopBrowser::CreateDeskWnd ? + SystemParametersInfoW(SPI_GETWORKAREA, 0, &rcWorkArea, 0); + + ::SetWindowPos(m_hWndShellView, NULL, + rcWorkArea.left, rcWorkArea.top, + rcWorkArea.right - rcWorkArea.left, + rcWorkArea.bottom - rcWorkArea.top, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER); + } + return 0; +} + +LRESULT CDesktopBrowser::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + return _NotifyTray(TWM_DOEXITWINDOWS, 0, 0); +} + +LRESULT CDesktopBrowser::OnOpenNewWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + TRACE("Proxy Desktop message 1035 received.\n"); + SHOnCWMCommandLine((HANDLE)lParam); + return 0; +} + +LRESULT CDesktopBrowser::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + ::SetFocus(m_hWndShellView); + return 0; +} + +HRESULT CDesktopBrowser_CreateInstance(IShellDesktopTray *Tray, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CDesktopBrowser, IShellDesktopTray*>(Tray, riid, ppv); +} /************************************************************************* * SHCreateDesktop [SHELL32.200] * */ -HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) -{ - HWND hWndDesk; - int x, y, cx, cy; - - if (ShellDesk == NULL) +HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *Tray) +{ + if (Tray == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (RegisterProgmanWindowClass() == 0) - { - WARN("Failed to register the Progman window class!\n"); + CComPtr<IShellBrowser> Browser; + HRESULT hr = CDesktopBrowser_CreateInstance(Tray, IID_PPV_ARG(IShellBrowser, &Browser)); + if (FAILED_UNEXPECTEDLY(hr)) return NULL; - } - - x = GetSystemMetrics(SM_XVIRTUALSCREEN); - y = GetSystemMetrics(SM_YVIRTUALSCREEN); - cx = GetSystemMetrics(SM_CXVIRTUALSCREEN); - cy = GetSystemMetrics(SM_CYVIRTUALSCREEN); - - if (!cx || !cy) - { - x = y = 0; - cx = GetSystemMetrics(SM_CXSCREEN); - cy = GetSystemMetrics(SM_CYSCREEN); - } - - hWndDesk = ::CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - x, y, cx, cy, - NULL, NULL, shell32_hInstance, (LPVOID)ShellDesk); - - if (hWndDesk != NULL) - { - ::ShowWindow(hWndDesk, SW_SHOW); - ::UpdateWindow(hWndDesk); - - return (HANDLE)GetWindowLongPtrW(hWndDesk, 0); - } - - return NULL; + + return static_cast<HANDLE>(Browser.Detach()); } /************************************************************************* @@ -658,13 +426,34 @@ */ BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop) { - CDesktopBrowser *Desk = static_cast<CDesktopBrowser *>(hDesktop); - - if (Desk == NULL || Desk->Tag != SHDESK_TAG) + if (hDesktop == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - return Desk->MessageLoop(); -} + MSG Msg; + BOOL bRet; + + CComPtr<IShellBrowser> browser; + CComPtr<IShellView> shellView; + + browser.Attach(static_cast<IShellBrowser*>(hDesktop)); + HRESULT hr = browser->QueryActiveShellView(&shellView); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0) + { + if (bRet != -1) + { + if (shellView->TranslateAcceleratorW(&Msg) != S_OK) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + } + } + + return TRUE; +}

1 0

[pschweitzer] 72098: [NET/USE] In case an automatic drive letter assignment was asked (net use * REMOTE), print the mapping that was performed on success. ROSAPPS-303
by pschweitzer＠svn.reactos.org 03 Aug '16

03 Aug '16

Author: pschweitzer Date: Wed Aug 3 14:42:49 2016 New Revision: 72098 URL: http://svn.reactos.org/svn/reactos?rev=72098&view=rev Log: [NET/USE] In case an automatic drive letter assignment was asked (net use * REMOTE), print the mapping that was performed on success. ROSAPPS-303 Modified: trunk/reactos/base/applications/network/net/cmdUse.c Modified: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Wed Aug 3 14:42:49 2016 @@ -8,6 +8,8 @@ */ #include "net.h" + +#define COUNT_OF(a) (sizeof(a) / sizeof(a[0])) static DWORD @@ -130,6 +132,8 @@ { BOOL Persist = FALSE; NETRESOURCE lpNet; + WCHAR Access[256]; + DWORD OutFlags = 0, Size = COUNT_OF(Access); Len = wcslen(argv[3]); if (Len < 4) @@ -186,6 +190,10 @@ lpNet.lpRemoteName = argv[3]; lpNet.lpProvider = NULL; - return WNetAddConnection2(&lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0)); + Status = WNetUseConnection(NULL, &lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0), Access, &Size, &OutFlags); + if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags == CONNECT_LOCALDRIVE) + printf("%S is now connected to %S\n", argv[3], Access); + + return Status; } }

1 0

[pschweitzer] 72097: [MPR] Return the correct local name in case of automatic redirection. Alreaedy sent upstream. CORE-11757
by pschweitzer＠svn.reactos.org 03 Aug '16

03 Aug '16

Author: pschweitzer Date: Wed Aug 3 14:41:23 2016 New Revision: 72097 URL: http://svn.reactos.org/svn/reactos?rev=72097&view=rev Log: [MPR] Return the correct local name in case of automatic redirection. Alreaedy sent upstream. CORE-11757 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Wed Aug 3 14:41:23 2016 @@ -1918,7 +1918,7 @@ else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); - if (redirect) + if (ret != NO_ERROR && redirect) letter[0] -= 1; } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'c');

1 0

[pschweitzer] 72096: [FASTFAT] Fixes suggested by Thomas: - Don't dereference cached data after unpinning - Pin big enough data to read direntries CORE-11377
by pschweitzer＠svn.reactos.org 03 Aug '16

03 Aug '16

Author: pschweitzer Date: Wed Aug 3 12:54:46 2016 New Revision: 72096 URL: http://svn.reactos.org/svn/reactos?rev=72096&view=rev Log: [FASTFAT] Fixes suggested by Thomas: - Don't dereference cached data after unpinning - Pin big enough data to read direntries CORE-11377 Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Wed Aug 3 12:54:46 2016 @@ -100,7 +100,7 @@ Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; _SEH2_TRY { - CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FATX_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry); + CcPinRead(pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, PIN_WAIT, &Context, (PVOID*)&pDirEntry); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -118,15 +118,16 @@ RtlUnicodeStringToOemString(&NameA, FileName, FALSE); pDirEntry->FilenameLength = (unsigned char)NameA.Length; - CcSetDirtyPinnedData(Context, NULL); - CcUnpinData(Context); - /* Update FCB */ DirContext.ShortNameU.Length = 0; DirContext.ShortNameU.MaximumLength = 0; DirContext.ShortNameU.Buffer = NULL; DirContext.LongNameU = *FileName; DirContext.DirEntry.FatX = *pDirEntry; + + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + Status = vfatUpdateFCB(DeviceExt, pFcb, &DirContext, pFcb->parentFcb); if (NT_SUCCESS(Status)) { @@ -862,7 +863,7 @@ Offset.u.LowPart = (i * sizeof(FAT_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; _SEH2_TRY { - CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FAT_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry); + CcPinRead(pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, PIN_WAIT, &Context, (PVOID*)&pDirEntry); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -878,13 +879,8 @@ (PDIR_ENTRY)&pDirEntry[i % (PAGE_SIZE / sizeof(FAT_DIR_ENTRY))]); } } - if (Context) - { - CcSetDirtyPinnedData(Context, NULL); - CcUnpinData(Context); - } - - /* In case of moving, don't delete data */ + + /* In case of moving, save properties */ if (MoveContext != NULL) { pDirEntry = &pDirEntry[pFcb->dirIndex % (PAGE_SIZE / sizeof(FAT_DIR_ENTRY))]; @@ -893,7 +889,15 @@ MoveContext->CreationTime = pDirEntry->CreationTime; MoveContext->CreationDate = pDirEntry->CreationDate; } - else + + if (Context) + { + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + } + + /* In case of moving, don't delete data */ + if (MoveContext == NULL) { while (CurrentCluster && CurrentCluster != 0xffffffff) { @@ -934,7 +938,7 @@ Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; _SEH2_TRY { - CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FATX_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry); + CcPinRead(pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, PIN_WAIT, &Context, (PVOID*)&pDirEntry); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -946,10 +950,8 @@ pDirEntry->FilenameLength = 0xe5; CurrentCluster = vfatDirEntryGetFirstCluster(DeviceExt, (PDIR_ENTRY)pDirEntry); - CcSetDirtyPinnedData(Context, NULL); - CcUnpinData(Context); - - /* In case of moving, don't delete data */ + + /* In case of moving, save properties */ if (MoveContext != NULL) { MoveContext->FirstCluster = CurrentCluster; @@ -957,7 +959,12 @@ MoveContext->CreationTime = pDirEntry->CreationTime; MoveContext->CreationDate = pDirEntry->CreationDate; } - else + + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + + /* In case of moving, don't delete data */ + if (MoveContext == NULL) { while (CurrentCluster && CurrentCluster != 0xffffffff) {

1 0

[akhaldi] 72095: [0.4.2] * Merge the notepad Danish translation improvement by Hermès in r72078.
by akhaldi＠svn.reactos.org 02 Aug '16

02 Aug '16

Author: akhaldi Date: Tue Aug 2 17:35:51 2016 New Revision: 72095 URL: http://svn.reactos.org/svn/reactos?rev=72095&view=rev Log: [0.4.2] * Merge the notepad Danish translation improvement by Hermès in r72078. Modified: branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 2 17:35:51 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067,72092 +/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067,72078,72092 Modified: branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] Tue Aug 2 17:35:51 2016 @@ -23,8 +23,8 @@ POPUP "&Fil" BEGIN MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "Ã&bn\tEnter", CMD_OPEN - MENUITEM "&Gem", CMD_SAVE + MENUITEM "Ã&bn...\tCtrl+O", CMD_OPEN + MENUITEM "&Gem\tCtrl+S", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "Side&opsÃ¦tning...", CMD_PAGE_SETUP

1 0

[akhaldi] 72094: [0.4.2] * Merge the browseui disc names fix by Christoph in r72092. CORE-11458
by akhaldi＠svn.reactos.org 02 Aug '16

02 Aug '16

Author: akhaldi Date: Tue Aug 2 17:21:30 2016 New Revision: 72094 URL: http://svn.reactos.org/svn/reactos?rev=72094&view=rev Log: [0.4.2] * Merge the browseui disc names fix by Christoph in r72092. CORE-11458 Modified: branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 2 17:21:30 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067 +/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067,72092 Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Tue Aug 2 17:21:30 2016 @@ -350,7 +350,7 @@ /* Get the name of the node */ WCHAR wszDisplayName[MAX_PATH]; - if (!ILGetDisplayNameEx(psfParent, pEltRelative, wszDisplayName, ILGDN_INFOLDER)) + if (!ILGetDisplayNameEx(psfParent, pElt, wszDisplayName, ILGDN_INFOLDER)) { ERR("Failed to get node name\n"); return NULL;

1 0

[hbelusca] 72093: [WIN32K] - Deduplicate NtUserScrollWindowEx / IntScrollWindowEx by making NtUserScrollWindowEx properly call IntScrollWindowEx instead. - Fix potential memory leaks in failure pat...
by hbelusca＠svn.reactos.org 02 Aug '16

02 Aug '16

Author: hbelusca Date: Tue Aug 2 16:02:54 2016 New Revision: 72093 URL: http://svn.reactos.org/svn/reactos?rev=72093&view=rev Log: [WIN32K] - Deduplicate NtUserScrollWindowEx / IntScrollWindowEx by making NtUserScrollWindowEx properly call IntScrollWindowEx instead. - Fix potential memory leaks in failure paths in IntScrollWindowEx. Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] Tue Aug 2 16:02:54 2016 @@ -238,8 +238,8 @@ LPRECT prcUpdate, UINT flags) { + INT Result; RECTL rcScroll, rcClip, rcCaret; - INT Result; PWND CaretWnd; HDC hDC; PREGION RgnUpdate = NULL, RgnTemp, RgnWinupd = NULL; @@ -248,19 +248,20 @@ int rdw_flags; USER_REFERENCE_ENTRY CaretRef; + if (!Window || !IntIsWindowDrawable(Window)) + { + return ERROR; + } + IntGetClientRect(Window, &rcClip); if (prcScroll) - { RECTL_bIntersectRect(&rcScroll, &rcClip, prcScroll); - } else rcScroll = rcClip; if (prcClip) - { RECTL_bIntersectRect(&rcClip, &rcClip, prcClip); - } if (rcClip.right <= rcClip.left || rcClip.bottom <= rcClip.top || (dx == 0 && dy == 0)) @@ -283,7 +284,8 @@ if (!RgnTemp) { EngSetLastError(ERROR_INVALID_HANDLE); - return ERROR; + Result = ERROR; + goto Cleanup; } IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); REGION_UnlockRgn(RgnTemp); @@ -311,7 +313,8 @@ if (!hDC) { /* FIXME: SetLastError? */ - return ERROR; + Result = ERROR; + goto Cleanup; } rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; @@ -339,7 +342,8 @@ if (!RgnTemp) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return ERROR; + Result = ERROR; + goto Cleanup; } if (co_IntGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) @@ -349,7 +353,8 @@ { if (hrgnUpdate) { - RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); + RgnWinupd = IntSysCreateRectpRgn(0, 0, 0, 0); + // FIXME: What to do if RgnWinupd == NULL?? IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); } @@ -381,10 +386,7 @@ for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { rcChild = Child->rcWindow; - rcChild.left -= ClientOrigin.x; - rcChild.top -= ClientOrigin.y; - rcChild.right -= ClientOrigin.x; - rcChild.bottom -= ClientOrigin.y; + RECTL_vOffsetRect(&rcChild, -ClientOrigin.x, -ClientOrigin.y); if (!prcScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) { @@ -396,9 +398,9 @@ lParam = MAKELONG(rcChild.left + dx, rcChild.top + dy); /* wine sends WM_POSCHANGING, WM_POSCHANGED messages */ - /* windows sometimes a WM_MOVE */ + /* windows sometimes a WM_MOVE */ co_IntSendMessage(UserHMGetHandle(Child), WM_MOVE, 0, lParam); - + UserDerefObjectCo(Child); } } @@ -436,6 +438,7 @@ REGION_UnlockRgn(RgnTemp); } +Cleanup: if (RgnWinupd) { REGION_Delete(RgnWinupd); @@ -478,9 +481,9 @@ LPRECT prcUnsafeUpdate) { DECLARE_RETURN(DWORD); + DWORD Result; + NTSTATUS Status = STATUS_SUCCESS; RECTL rcScroll, rcClip, rcUpdate; - NTSTATUS Status = STATUS_SUCCESS; - DWORD Result; TRACE("Enter NtUserScrollDC\n"); UserEnterExclusive(); @@ -506,7 +509,8 @@ { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -516,14 +520,14 @@ Result = UserScrollDC( hDC, dx, dy, - prcUnsafeScroll? &rcScroll : 0, - prcUnsafeClip? &rcClip : 0, + prcUnsafeScroll ? &rcScroll : NULL, + prcUnsafeClip ? &rcClip : NULL, hrgnUpdate, NULL, - prcUnsafeUpdate? &rcUpdate : NULL); + prcUnsafeUpdate ? &rcUpdate : NULL); if(Result == ERROR) { - /* FIXME: Only if hRgnUpdate is invalid we should SetLastError(ERROR_INVALID_HANDLE) */ + /* FIXME: Only if hRgnUpdate is invalid we should SetLastError(ERROR_INVALID_HANDLE) */ RETURN(FALSE); } @@ -537,7 +541,8 @@ { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; + if (!NT_SUCCESS(Status)) { /* FIXME: SetLastError? */ @@ -572,17 +577,12 @@ LPRECT prcUnsafeUpdate, UINT flags) { - RECTL rcScroll, rcClip, rcCaret, rcUpdate; + DECLARE_RETURN(DWORD); INT Result; - PWND Window = NULL, CaretWnd; - HDC hDC; - PREGION RgnUpdate = NULL, RgnTemp, RgnWinupd = NULL; - HWND hwndCaret; - DWORD dcxflags = 0; - int rdw_flags; NTSTATUS Status = STATUS_SUCCESS; - DECLARE_RETURN(DWORD); - USER_REFERENCE_ENTRY Ref, CaretRef; + PWND Window = NULL; + RECTL rcScroll, rcClip, rcUpdate; + USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserScrollWindowEx\n"); UserEnterExclusive(); @@ -591,33 +591,29 @@ if (!Window || !IntIsWindowDrawable(Window)) { Window = NULL; /* prevent deref at cleanup */ - RETURN( ERROR); + RETURN(ERROR); } UserRefObjectCo(Window, &Ref); - IntGetClientRect(Window, &rcClip); - _SEH2_TRY { if (prcUnsafeScroll) { ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); - RECTL_bIntersectRect(&rcScroll, &rcClip, prcUnsafeScroll); - } - else - rcScroll = rcClip; + rcScroll = *prcUnsafeScroll; + } if (prcUnsafeClip) { ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); - RECTL_bIntersectRect(&rcClip, &rcClip, prcUnsafeClip); + rcClip = *prcUnsafeClip; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; if (!NT_SUCCESS(Status)) { @@ -625,166 +621,13 @@ RETURN(ERROR); } - if (rcClip.right <= rcClip.left || rcClip.bottom <= rcClip.top || - (dx == 0 && dy == 0)) - { - RETURN(NULLREGION); - } - - /* We must use a copy of the region, as we can't hold an exclusive lock - * on it while doing callouts to user-mode */ - RgnUpdate = IntSysCreateRectpRgn(0, 0, 0, 0); - if(!RgnUpdate) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - RETURN(ERROR); - } - - if (hrgnUpdate) - { - RgnTemp = REGION_LockRgn(hrgnUpdate); - if (!RgnTemp) - { - EngSetLastError(ERROR_INVALID_HANDLE); - RETURN(ERROR); - } - IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); - REGION_UnlockRgn(RgnTemp); - } - - /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ - if (flags & SW_SCROLLWNDDCE) - { - dcxflags = DCX_USESTYLE; - - if (!(Window->pcls->style & (CS_OWNDC|CS_CLASSDC))) - dcxflags |= DCX_CACHE; // AH??? wine~ If not Powned or with Class go Cheap! - - if (flags & SW_SCROLLCHILDREN && Window->style & WS_CLIPCHILDREN) - dcxflags |= DCX_CACHE|DCX_NOCLIPCHILDREN; - } - else - { - /* So in this case ScrollWindowEx uses Cache DC. */ - dcxflags = DCX_CACHE|DCX_USESTYLE; - if (flags & SW_SCROLLCHILDREN) dcxflags |= DCX_NOCLIPCHILDREN; - } - - hDC = UserGetDCEx(Window, 0, dcxflags); - if (!hDC) - { - /* FIXME: SetLastError? */ - RETURN(ERROR); - } - - rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; - - rcCaret = rcScroll; - hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); - - Result = UserScrollDC( hDC, - dx, - dy, - &rcScroll, - &rcClip, - NULL, - RgnUpdate, - prcUnsafeUpdate? &rcUpdate : NULL); - - UserReleaseDC(Window, hDC, FALSE); - - /* - * Take into account the fact that some damage may have occurred during - * the scroll. Keep a copy in hrgnWinupd to be added to hrngUpdate at the end. - */ - - RgnTemp = IntSysCreateRectpRgn(0, 0, 0, 0); - if (!RgnTemp) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - RETURN(ERROR); - } - - if (co_IntGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) - { - PREGION RgnClip = IntSysCreateRectpRgnIndirect(&rcClip); - if (RgnClip) - { - if (hrgnUpdate) - { - RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); - IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); - } - - REGION_bOffsetRgn(RgnTemp, dx, dy); - - IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND); - - if (hrgnUpdate) - IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR ); - - co_UserRedrawWindow(Window, NULL, RgnTemp, rdw_flags ); - - REGION_Delete(RgnClip); - } - } - REGION_Delete(RgnTemp); - - if (flags & SW_SCROLLCHILDREN) - { - PWND Child; - RECTL rcChild; - POINT ClientOrigin; - USER_REFERENCE_ENTRY WndRef; - RECTL rcDummy; - LPARAM lParam; - - IntGetClientOrigin(Window, &ClientOrigin); - - for (Child = Window->spwndChild; Child; Child = Child->spwndNext) - { - rcChild = Child->rcWindow; - rcChild.left -= ClientOrigin.x; - rcChild.top -= ClientOrigin.y; - rcChild.right -= ClientOrigin.x; - rcChild.bottom -= ClientOrigin.y; - - if (!prcUnsafeScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) - { - UserRefObjectCo(Child, &WndRef); - - if (Window->spwndParent == UserGetDesktopWindow()) // Window->spwndParent->fnid == FNID_DESKTOP ) - lParam = MAKELONG(Child->rcClient.left, Child->rcClient.top); - else - lParam = MAKELONG(rcChild.left + dx, rcChild.top + dy); - - /* wine sends WM_POSCHANGING, WM_POSCHANGED messages */ - /* windows sometimes a WM_MOVE */ - co_IntSendMessage(UserHMGetHandle(Child), WM_MOVE, 0, lParam); - - UserDerefObjectCo(Child); - } - } - } - - if (flags & (SW_INVALIDATE | SW_ERASE)) - { - co_UserRedrawWindow( Window, - NULL, - RgnUpdate, - rdw_flags | /* HACK */ - ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : RDW_NOCHILDREN) ); - } - - if (hwndCaret && (CaretWnd = UserGetWindowObject(hwndCaret))) - { - UserRefObjectCo(CaretWnd, &CaretRef); - - co_IntSetCaretPos(rcCaret.left + dx, rcCaret.top + dy); - co_UserShowCaret(CaretWnd); - - UserDerefObjectCo(CaretWnd); - } + Result = IntScrollWindowEx(Window, + dx, dy, + prcUnsafeScroll ? &rcScroll : NULL, + prcUnsafeClip ? &rcClip : NULL, + hrgnUpdate, + prcUnsafeUpdate ? &rcUpdate : NULL, + flags); if (prcUnsafeUpdate) { @@ -798,7 +641,7 @@ { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; if (!NT_SUCCESS(Status)) { @@ -810,29 +653,6 @@ RETURN(Result); CLEANUP: - if (hrgnUpdate && (_ret_ != ERROR)) - { - /* Give everything back to the caller */ - RgnTemp = REGION_LockRgn(hrgnUpdate); - /* The handle should still be valid */ - ASSERT(RgnTemp); - if (RgnWinupd) - IntGdiCombineRgn(RgnTemp, RgnUpdate, RgnWinupd, RGN_OR); - else - IntGdiCombineRgn(RgnTemp, RgnUpdate, NULL, RGN_COPY); - REGION_UnlockRgn(RgnTemp); - } - - if (RgnWinupd) - { - REGION_Delete(RgnWinupd); - } - - if (RgnUpdate) - { - REGION_Delete(RgnUpdate); - } - if (Window) UserDerefObjectCo(Window); @@ -841,5 +661,4 @@ END_CLEANUP; } - /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs