Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[gadamopoulos] 65703: [EXPLORER] * Remove internal IStartMenuSite interface that didn't serve any purpose. * Stop using global instances of some core classes.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 17 12:44:58 2014 New Revision: 65703 URL: http://svn.reactos.org/svn/reactos?rev=65703&view=rev Log: [EXPLORER] * Remove internal IStartMenuSite interface that didn't serve any purpose. * Stop using global instances of some core classes. Modified: trunk/reactos/base/shell/explorer/desktop.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/startmnusite.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -23,7 +23,6 @@ class CDesktopThread { HANDLE m_hEvent; - HANDLE m_hDesktop; CComPtr<ITrayWindow> m_Tray; DWORD DesktopThreadProc() @@ -65,12 +64,11 @@ public: CDesktopThread() : m_hEvent(NULL), - m_hDesktop(NULL), m_Tray(NULL) { } - HANDLE Initialize(IN OUT ITrayWindow *pTray) + HRESULT Initialize(IN OUT ITrayWindow *pTray) { HANDLE hThread; HANDLE Handles[2]; @@ -79,13 +77,13 @@ m_hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); if (!m_hEvent) - return NULL; + return E_FAIL; hThread = CreateThread(NULL, 0, s_DesktopThreadProc, (PVOID)this, 0, NULL); if (!hThread) { CloseHandle(m_hEvent); - return NULL; + return E_FAIL; } Handles[0] = hThread; @@ -107,36 +105,33 @@ CloseHandle(hThread); CloseHandle(m_hEvent); - // FIXME: Never assigned, will always return default value (NULL). - return m_hDesktop; + return S_OK; } void Destroy() { return; } - -} * g_pDesktopWindowInstance; +}; HANDLE DesktopCreateWindow(IN OUT ITrayWindow *Tray) { - if (!g_pDesktopWindowInstance) + CDesktopThread* pDesktopThread = new CDesktopThread(); + + HRESULT hres = pDesktopThread->Initialize(Tray); + if(FAILED_UNEXPECTEDLY(hres)) { - g_pDesktopWindowInstance = new CDesktopThread(); + delete pDesktopThread; + return NULL; } - - if (!g_pDesktopWindowInstance) - return NULL; - return g_pDesktopWindowInstance->Initialize(Tray); + return pDesktopThread; } VOID DesktopDestroyShellWindow(IN HANDLE hDesktop) { - if (g_pDesktopWindowInstance) - { - g_pDesktopWindowInstance->Destroy(); - } + CDesktopThread* pDesktopThread = reinterpret_cast<CDesktopThread*>(hDesktop); + pDesktopThread->Destroy(); } Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -296,33 +296,9 @@ HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); -#define INTERFACE IStartMenuSite -DECLARE_INTERFACE_(IStartMenuSite, IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT, QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG, AddRef) (THIS) PURE; - STDMETHOD_(ULONG, Release) (THIS) PURE; - /*** IStartMenuSite ***/ -}; -#undef INTERFACE - -#if defined(COBJMACROS) -/*** IUnknown methods ***/ -#define IStartMenuSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IStartMenuSite_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IStartMenuSite_Release(p) (p)->lpVtbl->Release(p) -/*** IStartMenuSite methods ***/ -#endif - IMenuPopup* CreateStartMenu(IN ITrayWindow *Tray, OUT IMenuBand **ppMenuBand, -IN HBITMAP hbmBanner OPTIONAL, -IN BOOL bSmallIcons); - -HRESULT -UpdateStartMenu(IN OUT IMenuPopup *pMenuPopup, IN HBITMAP hbmBanner OPTIONAL, IN BOOL bSmallIcons); @@ -350,6 +326,8 @@ #define NTNWM_REALIGN (0x1) +class CTrayNotifyWnd; + BOOL RegisterTrayNotifyWndClass(VOID); @@ -357,15 +335,14 @@ UnregisterTrayNotifyWndClass(VOID); HWND -CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, -IN BOOL bHideClock); - -VOID -TrayNotify_NotifyMsg(IN WPARAM wParam, +CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, IN BOOL bHideClock, CTrayNotifyWnd** ppTrayNotify); + +VOID +TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, IN WPARAM wParam, IN LPARAM lParam); BOOL -TrayNotify_GetClockRect(OUT PRECT rcClock); +TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock); /* * taskswnd.c @@ -385,7 +362,7 @@ IN OUT ITrayWindow *Tray); HRESULT -Tray_OnStartMenuDismissed(); +Tray_OnStartMenuDismissed(ITrayWindow* Tray); HRESULT IsSameObject(IN IUnknown *punk1, IN IUnknown *punk2); Modified: trunk/reactos/base/shell/explorer/startmnusite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… ============================================================================== --- trunk/reactos/base/shell/explorer/startmnusite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnusite.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -20,14 +20,9 @@ #include "precomp.h" -/***************************************************************************** - ** IStartMenuSite *********************************************************** - *****************************************************************************/ - class CStartMenuSite : public CComCoClass<CStartMenuSite>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IStartMenuSite, public IServiceProvider, public ITrayPriv, public IOleCommandTarget, @@ -364,7 +359,7 @@ { if (!fSet) { - return Tray_OnStartMenuDismissed(); + return Tray_OnStartMenuDismissed(m_Tray); } return S_OK; Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -1561,25 +1561,24 @@ } }; -static CTrayNotifyWnd * g_Instance; - -HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *Tray, BOOL bHideClock) +HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *Tray, BOOL bHideClock, CTrayNotifyWnd** ppinstance) { + CTrayNotifyWnd * pTrayNotify = new CTrayNotifyWnd(); // TODO: Destroy after the window is destroyed - g_Instance = new CTrayNotifyWnd(); - - return g_Instance->_Init(Tray, bHideClock); + *ppinstance = pTrayNotify; + + return pTrayNotify->_Init(Tray, bHideClock); } VOID -TrayNotify_NotifyMsg(WPARAM wParam, LPARAM lParam) +TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, WPARAM wParam, LPARAM lParam) { BOOL bDummy; - g_Instance->NotifyMsg(0, wParam, lParam, bDummy); + pTrayNotify->NotifyMsg(0, wParam, lParam, bDummy); } BOOL -TrayNotify_GetClockRect(OUT PRECT rcClock) +TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock) { - return g_Instance->GetClockRect(rcClock); + return pTrayNotify->GetClockRect(rcClock); } Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -370,6 +370,8 @@ HWND m_Rebar; HWND m_TaskSwitch; HWND m_TrayNotify; + + CTrayNotifyWnd* m_TrayNotifyInstance; DWORD m_Position; HMONITOR m_Monitor; @@ -1524,7 +1526,7 @@ SetWindowTheme(m_Rebar, L"TaskBar", NULL); /* Create the tray notification window */ - m_TrayNotify = CreateTrayNotifyWnd(this, HideClock); + m_TrayNotify = CreateTrayNotifyWnd(this, HideClock, &m_TrayNotifyInstance); if (UpdateNonClientMetrics()) { @@ -2170,7 +2172,7 @@ { if (m_TrayNotify) { - TrayNotify_NotifyMsg(wParam, lParam); + TrayNotify_NotifyMsg(m_TrayNotifyInstance, wParam, lParam); } return TRUE; } @@ -2541,7 +2543,7 @@ /* We should forward mouse messages to child windows here. Right now, this is only clock double-click */ RECT rcClock; - if (TrayNotify_GetClockRect(&rcClock)) + if (TrayNotify_GetClockRect(m_TrayNotifyInstance, &rcClock)) { POINT ptClick; ptClick.x = MAKEPOINTS(lParam).x; @@ -3091,15 +3093,6 @@ return S_OK; } -CTrayWindow * g_TrayWindow; - -HRESULT -Tray_OnStartMenuDismissed() -{ - return g_TrayWindow->RaiseStartButton(); -} - - HRESULT CreateTrayWindow(ITrayWindow ** ppTray) { CComPtr<CTrayWindow> Tray = new CComObject<CTrayWindow>(); @@ -3108,19 +3101,27 @@ Tray->_Init(); Tray->Open(); - g_TrayWindow = Tray; *ppTray = (ITrayWindow *) Tray; return S_OK; } -VOID TrayProcessMessages(ITrayWindow *) +HRESULT +Tray_OnStartMenuDismissed(ITrayWindow* Tray) { - g_TrayWindow->TrayProcessMessages(); + CTrayWindow * TrayWindow = static_cast<CTrayWindow *>(Tray); + return TrayWindow->RaiseStartButton(); } -VOID TrayMessageLoop(ITrayWindow *) +VOID TrayProcessMessages(ITrayWindow *Tray) { - g_TrayWindow->TrayMessageLoop(); + CTrayWindow * TrayWindow = static_cast<CTrayWindow *>(Tray); + TrayWindow->TrayProcessMessages(); } + +VOID TrayMessageLoop(ITrayWindow *Tray) +{ + CTrayWindow * TrayWindow = static_cast<CTrayWindow *>(Tray); + TrayWindow->TrayMessageLoop(); +}

10 years

[gadamopoulos] 65702: [RSHELL] * Disable themes for the toolbars used for shell menus * See issue CORE-8922 for details

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 17 12:38:19 2014 New Revision: 65702 URL: http://svn.reactos.org/svn/reactos?rev=65702&view=rev Log: [RSHELL] * Disable themes for the toolbars used for shell menus * See issue CORE-8922 for details Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Dec 17 12:38:19 2014 @@ -384,6 +384,8 @@ SubclassWindow(Create(hwndParent, tbStyles, tbExStyles)); + SetWindowTheme(m_hWnd, L"", L""); + // If needed, create the pager. if (m_usePager) {

10 years

[gadamopoulos] 65701: [RSHELL] - Remove definition for an undocumented function that already exists in our headers - See issue CORE-8920

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 17 12:28:35 2014 New Revision: 65701 URL: http://svn.reactos.org/svn/reactos?rev=65701&view=rev Log: [RSHELL] - Remove definition for an undocumented function that already exists in our headers - See issue CORE-8920 Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Dec 17 12:28:35 2014 @@ -32,13 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuToolbars); -extern "C" -HRESULT WINAPI SHGetImageList( - _In_ int iImageList, - _In_ REFIID riid, - _Out_ void **ppv - ); - // FIXME: Enable if/when wine comctl supports this flag properly #define USE_TBSTYLE_EX_VERTICAL 0

10 years

[gadamopoulos] 65700: [RSHELL] - Simplify some code by using shlwapi helpers - See issue CORE-8919

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 17 12:11:31 2014 New Revision: 65700 URL: http://svn.reactos.org/svn/reactos?rev=65700&view=rev Log: [RSHELL] - Simplify some code by using shlwapi helpers - See issue CORE-8919 Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Wed Dec 17 12:11:31 2014 @@ -89,13 +89,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) { - CComPtr<IInputObjectSite> ios; - - HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return ios->OnFocusChangeIS(punkObj, fSetFocus); + return IUnknown_OnFocusChangeIS(m_Client, punkObj, fSetFocus); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, @@ -177,24 +171,12 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO() { - CComPtr<IInputObject> io; - - HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return io->HasFocusIO(); + return IUnknown_HasFocusIO(m_Client); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg) { - CComPtr<IInputObject> io; - - HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return io->TranslateAcceleratorIO(lpMsg); + return IUnknown_TranslateAcceleratorIO(m_Client, lpMsg); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient) @@ -564,20 +546,15 @@ while (popup) { HRESULT hr; - CComPtr<IOleWindow> window; - - hr = popup->QueryInterface(IID_PPV_ARG(IOleWindow, &window)); + HWND parent; + + hr = IUnknown_GetWindow(popup, &parent); if (FAILED_UNEXPECTEDLY(hr)) return FALSE; - - HWND parent; - - hr = window->GetWindow(&parent); - if (SUCCEEDED(hr) && hwnd == parent) + if (hwnd == parent) return TRUE; - popup = NULL; - hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup)); + hr = IUnknown_GetSite(popup, IID_PPV_ARG(IMenuPopup, &popup)); if (FAILED(hr)) return FALSE; }

10 years

[gadamopoulos] 65699: Try to fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 17 11:46:19 2014 New Revision: 65699 URL: http://svn.reactos.org/svn/reactos?rev=65699&view=rev Log: Try to fix build Modified: trunk/reactos/base/shell/rshell/CMergedFolder.h trunk/reactos/base/shell/rshell/CStartMenu.cpp trunk/reactos/include/reactos/shlguid_undoc.h Modified: trunk/reactos/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF… ============================================================================== --- trunk/reactos/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMergedFolder.h [iso-8859-1] Wed Dec 17 11:46:19 2014 @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #pragma once - -extern IID IID_IAugmentedShellFolder; -extern IID IID_IAugmentedShellFolder2; -extern IID IID_IAugmentedShellFolder3; -extern CLSID CLSID_MergedFolder; interface IAugmentedShellFolder : public IShellFolder { Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMe… ============================================================================== --- trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Dec 17 11:46:19 2014 @@ -22,12 +22,6 @@ #include "CMergedFolder.h" WINE_DEFAULT_DEBUG_CHANNEL(CStartMenu); - -// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) -IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; -IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; -IID IID_IAugmentedShellFolder3 = { 0x4F755EA8, 0x247D, 0x479B, { 0x91, 0x81, 0x22, 0x7D, 0x09, 0xC2, 0xE0, 0x01 } }; -CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; //#define TEST_TRACKPOPUPMENU_SUBMENUS Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Wed Dec 17 11:46:19 2014 @@ -107,9 +107,10 @@ DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); +DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); DEFINE_GUID(IID_IAugmentedShellFolder, 0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); -DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); - +DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8DB3B3F4, 0x6CFE, 0x11D1, 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); +DEFINE_GUID(IID_IAugmentedShellFolder3, 0x4F755EA8, 0x247D, 0x479B, 0x91, 0x81, 0x22, 0x7D, 0x09, 0xC2, 0xE0, 0x01); #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar

10 years

[gadamopoulos] 65698: [BROWSEUI] * Simplify a lot of methods my using helpers from shlwapi. * Remove declarations for undocumented functions that are already declared in our headers. * Move definit...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 17 11:35:07 2014 New Revision: 65698 URL: http://svn.reactos.org/svn/reactos?rev=65698&view=rev Log: [BROWSEUI] * Simplify a lot of methods my using helpers from shlwapi. * Remove declarations for undocumented functions that are already declared in our headers. * Move definitions of IID_IAugmentedShellFolder and CLSID_MergedFolder to our headers. * Remove definitions of functions that are already implemented in shlwapi. * Add CreateMergedFolder and CreateMenuBand functions in precomp.h in order to simplify creating these objects when using rshell. Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/bandproxy.cpp trunk/reactos/dll/win32/browseui/brandband.cpp trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/dll/win32/browseui/toolsband.cpp trunk/reactos/include/reactos/shlguid_undoc.h trunk/reactos/include/reactos/shlwapi_undoc.h trunk/reactos/include/reactos/undocshell.h Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -29,13 +29,6 @@ HRESULT CreateAddressEditBox(REFIID riid, void **ppv); -extern "C" -HRESULT WINAPI SHGetImageList( - _In_ int iImageList, - _In_ REFIID riid, - _Out_ void **ppv - ); - /* TODO: ****Add command handler for show/hide Go button to OnWinEvent @@ -283,13 +276,7 @@ HRESULT STDMETHODCALLTYPE CAddressBand::QueryStatus( const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { - CComPtr<IOleCommandTarget> oleCommandTarget; - HRESULT hResult; - - hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - return oleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); + return IUnknown_QueryStatus(fAddressEditBox, *pguidCmdGroup, cCmds, prgCmds, pCmdText); } HRESULT STDMETHODCALLTYPE CAddressBand::Exec(const GUID *pguidCmdGroup, @@ -329,15 +316,9 @@ HRESULT STDMETHODCALLTYPE CAddressBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - CComPtr<IInputObjectSite> inputObjectSite; - HRESULT hResult; - if (fActivate) { - hResult = fSite->QueryInterface(IID_PPV_ARG(IInputObjectSite, &inputObjectSite)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = inputObjectSite->OnFocusChangeIS(static_cast<IDeskBand *>(this), fActivate); + IUnknown_OnFocusChangeIS(fSite, static_cast<IDeskBand *>(this), fActivate); SetFocus(); } return S_OK; Modified: trunk/reactos/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandpro… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -37,20 +37,15 @@ HRESULT CBandProxy::FindBrowserWindow(IUnknown **browser) { - CComPtr<IServiceProvider> serviceProvider; - CComPtr<IWebBrowser2> webBrowser; - HRESULT hResult; + IWebBrowser2* webBrowser; + HRESULT hResult; if (browser == NULL) return E_POINTER; - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); + hResult = IUnknown_QueryService(fSite, SID_IWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &webBrowser)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = serviceProvider->QueryService( - SID_IWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &webBrowser)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - *browser = webBrowser.Detach(); + *browser = webBrowser; return S_OK; } Modified: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -43,17 +43,6 @@ ::ExtTextOut(dc, 0, 0, ETO_OPAQUE, bounds, NULL, 0, NULL); } -long GetScreenDepth() -{ - HDC tempDC; - long depth; - - tempDC = GetDC(NULL); - depth = GetDeviceCaps(tempDC, BITSPIXEL) * GetDeviceCaps(tempDC, PLANES); - ReleaseDC(NULL, tempDC); - return depth; -} - static const int gSmallImageSize = 22; static const int gMediumImageSize = 26; static const int gLargeImageSize = 38; @@ -100,7 +89,7 @@ BITMAP bitmapInfo; int resourceID; - screenDepth = GetScreenDepth(); + screenDepth = SHGetCurColorRes(); GetClientRect(&clientRect); clientWidth = clientRect.right - clientRect.left; clientHeight = clientRect.bottom - clientRect.top; Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -29,14 +29,7 @@ #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) -#define USE_CUSTOM_MENUBAND 1 -HMODULE g_hRShell = NULL; - #if 1 -// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) - -IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; -CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; interface IAugmentedShellFolder : public IShellFolder { @@ -89,35 +82,6 @@ extern HRESULT CreateBrandBand(REFIID riid, void **ppv); extern HRESULT CreateBandProxy(REFIID riid, void **ppv); extern HRESULT CreateAddressBand(REFIID riid, void **ppv); - -typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); -typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); - -HMODULE hRShell = NULL; -PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = NULL; -PMENUBAND_CONSTRUCTOR pCMenuBand_Constructor = NULL; - -HRESULT IUnknown_HasFocusIO(IUnknown * punk) -{ - CComPtr<IInputObject> pio; - HRESULT hr; - hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - return pio->HasFocusIO(); -} - -HRESULT IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg) -{ - CComPtr<IInputObject> pio; - HRESULT hr; - if (!punk) - return E_FAIL; - hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - return pio->TranslateAcceleratorIO(pmsg); -} HRESULT IUnknown_RelayWinEvent(IUnknown * punk, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { @@ -478,28 +442,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if 1 - if (!hRShell) - { - hRShell = GetModuleHandle(L"rshell.dll"); - if (!hRShell) - hRShell = LoadLibrary(L"rshell.dll"); - } - - if (!pCMergedFolder_Constructor) - pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) GetProcAddress(hRShell, "CMergedFolder_Constructor"); - - if (pCMergedFolder_Constructor) - { - hr = pCMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); - } - else - { - hr = E_FAIL; - } -#else - hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); -#endif + hr = CreateMergedFolder(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); if (FAILED_UNEXPECTEDLY(hr)) { *ppsfFavorites = psfUserFavorites.Detach(); @@ -560,30 +503,7 @@ if (fFavoritesMenu.p == NULL) { -#if USE_CUSTOM_MENUBAND - if (!hRShell) - { - hRShell = GetModuleHandle(L"rshell.dll"); - if (!hRShell) - hRShell = LoadLibrary(L"rshell.dll"); - } - - if (!pCMenuBand_Constructor) - pCMenuBand_Constructor = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); - - if (pCMenuBand_Constructor) - { - hResult = pCMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &newMenu)); - } - else - { - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &newMenu)); - } -#else - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &newMenu)); -#endif + hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &newMenu)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED); @@ -751,29 +671,9 @@ *pMenuBar = NULL; - hResult = E_FAIL; -#if USE_CUSTOM_MENUBAND - if (!g_hRShell) g_hRShell = GetModuleHandleW(L"rshell.dll"); - - if (!g_hRShell) g_hRShell = LoadLibraryW(L"rshell.dll"); - - if (g_hRShell) - { - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(g_hRShell, "CMenuBand_Constructor"); - if (func) - { - hResult = func(IID_PPV_ARG(IShellMenu, &menubar)); - } - } -#endif - - if (FAILED_UNEXPECTEDLY(hResult)) - { - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &menubar)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - } + hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &menubar)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; hResult = fMenuCallback->QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); if (FAILED_UNEXPECTEDLY(hResult)) @@ -1403,8 +1303,6 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::SetSite(IUnknown *pUnkSite) { CComPtr<IBrowserService> browserService; - CComPtr<IServiceProvider> serviceProvider; - CComPtr<IOleWindow> oleWindow; HWND ownerWindow; HWND dockContainer; HRESULT hResult; @@ -1419,10 +1317,7 @@ else { // get window handle of owner - hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleWindow->GetWindow(&ownerWindow); + hResult = IUnknown_GetWindow(pUnkSite, &ownerWindow); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (ownerWindow == NULL) @@ -1447,9 +1342,7 @@ return E_FAIL; // take advice to watch events - hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); + hResult = IUnknown_QueryService(pUnkSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = AtlAdvise(browserService, static_cast<IDispatch *>(this), DIID_DWebBrowserEvents, &fAdviseCookie); } return S_OK; @@ -1467,7 +1360,6 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { - CComPtr<IServiceProvider> serviceProvider; HRESULT hResult; if (IsEqualIID(guidService, IID_IBandSite)) @@ -1577,15 +1469,10 @@ LRESULT CInternetToolbar::OnTravelBack(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IServiceProvider> serviceProvider; CComPtr<IWebBrowser> webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = serviceProvider->QueryService(SID_SShellBrowser, - IID_PPV_ARG(IWebBrowser, &webBrowser)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = webBrowser->GoBack(); @@ -1594,15 +1481,10 @@ LRESULT CInternetToolbar::OnTravelForward(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IServiceProvider> serviceProvider; CComPtr<IWebBrowser> webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = webBrowser->GoForward(); @@ -1611,13 +1493,7 @@ LRESULT CInternetToolbar::OnUpLevel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> oleCommandTarget; - HRESULT hResult; - - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleCommandTarget->Exec(&CGID_ShellBrowser, IDM_GOTO_UPONELEVEL, 0, NULL, NULL); + IUnknown_Exec(fSite, CGID_ShellBrowser, IDM_GOTO_UPONELEVEL, 0, NULL, NULL); return 1; } @@ -1654,13 +1530,7 @@ LRESULT CInternetToolbar::OnFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> oleCommandTarget; - HRESULT hResult; - - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleCommandTarget->Exec(&CGID_Explorer, 0x23, 0, NULL, NULL); + IUnknown_Exec(fSite, CGID_Explorer, 0x23, 0, NULL, NULL); return 1; } @@ -1677,7 +1547,6 @@ LRESULT CInternetToolbar::OnMenuDropDown(UINT idControl, NMHDR *pNMHDR, BOOL &bHandled) { - CComPtr<IServiceProvider> serviceProvider; CComPtr<IBrowserService> browserService; CComPtr<IOleCommandTarget> commandTarget; CComPtr<ITravelLog> travelLog; @@ -1703,14 +1572,11 @@ { case IDM_GOTO_BACK: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_BACK); - hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); commandInfo.cmdID = 0x1d; - hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); + hResult = IUnknown_QueryStatus(browserService, CGID_Explorer, 1, &commandInfo, NULL); if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) { @@ -1733,13 +1599,11 @@ break; case IDM_GOTO_FORWARD: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_FORE); - hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); commandInfo.cmdID = 0x1d; - hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); + hResult = IUnknown_QueryStatus(browserService, CGID_Explorer, 1, &commandInfo, NULL); if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) { Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -46,4 +46,47 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +#define USE_CUSTOM_MENUBAND 1 + +typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); + +static inline +HRESULT CreateMergedFolder(REFIID riid, void **ppv) +{ +#if 1 + HMODULE hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + + PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) + GetProcAddress(hRShell, "CMergedFolder_Constructor"); + + if (pCMergedFolder_Constructor) + { + return pCMergedFolder_Constructor(riid, ppv); + } +#endif + return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +} + +static inline +HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv) +{ +#if USE_CUSTOM_MENUBAND + HMODULE hRShell = GetModuleHandleW(L"rshell.dll"); + + if (!hRShell) + hRShell = LoadLibraryW(L"rshell.dll"); + + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + if (func) + { + return func(iid , ppv); + } +#endif + return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv); +} + #endif /* _BROWSEUI_PCH_ */ Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -25,11 +25,6 @@ #include <strsafe.h> #define USE_CUSTOM_EXPLORERBAND 1 - -extern "C" -BOOL WINAPI Shell_GetImageLists( - _Out_ HIMAGELIST *phiml, - _Out_ HIMAGELIST *phimlSmall); extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); @@ -148,34 +143,6 @@ // temporary extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); - - -HMENU SHGetMenuFromID(HMENU topMenu, int theID) -{ - MENUITEMINFO menuItemInfo; - - menuItemInfo.cbSize = sizeof(menuItemInfo); - menuItemInfo.fMask = MIIM_SUBMENU; - if (!GetMenuItemInfo(topMenu, theID, FALSE, &menuItemInfo)) - return NULL; - return menuItemInfo.hSubMenu; -} - -void SHCheckMenuItem(HMENU theMenu, int theID, BOOL checked) -{ - MENUITEMINFO menuItemInfo; - - menuItemInfo.cbSize = sizeof(menuItemInfo); - menuItemInfo.fMask = MIIM_STATE; - if (GetMenuItemInfo(theMenu, theID, FALSE, &menuItemInfo)) - { - if (checked) - menuItemInfo.fState |= MF_CHECKED; - else - menuItemInfo.fState &= ~MF_CHECKED; - SetMenuItemInfo(theMenu, theID, FALSE, &menuItemInfo); - } -} void DeleteMenuItems(HMENU theMenu, unsigned int firstIDToDelete, unsigned int lastIDToDelete) { @@ -985,9 +952,7 @@ ::SendMessage(fCurrentShellViewWindow, WM_SETREDRAW, 0, 0); // set site - hResult = newShellView->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); - if (SUCCEEDED(hResult) && objectWithSite.p != NULL) - hResult = objectWithSite->SetSite(static_cast<IDropTarget *>(this)); + hResult = IUnknown_SetSite(newShellView, static_cast<IDropTarget *>(this)); // update folder and view saveCurrentShellFolder = fCurrentShellFolder; @@ -2582,8 +2547,6 @@ return E_NOTIMPL; } -extern HRESULT IUnknown_HasFocusIO(IUnknown * punk); -extern HRESULT IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg); HRESULT STDMETHODCALLTYPE CShellBrowser::v_MayTranslateAccelerator(MSG *pmsg) { for (int i = 0; i < 3; i++) Modified: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsba… ============================================================================== --- trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -261,7 +261,6 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite){ HWND parentWindow; - IOleWindow *oleWindow; HWND toolbar; HRESULT hResult; @@ -273,13 +272,8 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (SUCCEEDED(hResult)) - { - oleWindow->GetWindow(&parentWindow); - oleWindow->Release(); - } - if (!::IsWindow(parentWindow)) + hResult = IUnknown_GetWindow(pUnkSite, &parentWindow); + if (FAILED(hResult) || !::IsWindow(parentWindow)) return E_FAIL; toolbar = CreateWindowEx( Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -107,6 +107,10 @@ DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); +DEFINE_GUID(IID_IAugmentedShellFolder, 0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); +DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); + + #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar #define SID_ITargetFrame2 IID_ITargetFrame2 Modified: trunk/reactos/include/reactos/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlwapi_un… ============================================================================== --- trunk/reactos/include/reactos/shlwapi_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlwapi_undoc.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -33,13 +33,6 @@ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); HRESULT WINAPI ConnectToConnectionPoint(IUnknown *lpUnkSink, REFIID riid, BOOL bAdviseOnly, IUnknown *lpUnknown, LPDWORD lpCookie, IConnectionPoint **lppCP); BOOL WINAPI SHIsSameObject(IUnknown *lpInt1, IUnknown *lpInt2); -HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd); -HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg); -HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site); -HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); -HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID riid, LPVOID *lppOut); -HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut); -HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg); BOOL WINAPI SHLoadMenuPopup(HINSTANCE hInst, LPCWSTR szName); void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lParam, BOOL bSend); DWORD WINAPI SHRemoveAllSubMenus(HMENU hMenu); @@ -47,9 +40,6 @@ DWORD WINAPI SHCheckMenuItem(HMENU hMenu, UINT uID, BOOL bCheck); DWORD WINAPI SHRegisterClassA(WNDCLASSA *wndclass); BOOL WINAPI SHSimulateDrop(IDropTarget *pDrop, IDataObject *pDataObj, DWORD grfKeyState, PPOINTL lpPt, DWORD* pdwEffect); -HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg, DWORD dwModifiers); -HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus); -HRESULT WINAPI IUnknown_HandleIRestrict(LPUNKNOWN lpUnknown, PVOID lpArg1, PVOID lpArg2, PVOID lpArg3, PVOID lpArg4); HMENU WINAPI SHGetMenuFromID(HMENU hMenu, UINT uID); DWORD WINAPI SHGetCurColorRes(void); DWORD WINAPI SHWaitForSendMessageThread(HANDLE hand, DWORD dwTimeout); @@ -84,6 +74,17 @@ #define SHCreateWorkerWindow SHCreateWorkerWindowA #endif +HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg); +HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); +HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut); +HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg); +HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg, DWORD dwModifiers); +HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus); +HRESULT WINAPI IUnknown_HandleIRestrict(LPUNKNOWN lpUnknown, PVOID lpArg1, PVOID lpArg2, PVOID lpArg3, PVOID lpArg4); +HRESULT WINAPI IUnknown_HasFocusIO(IUnknown * punk); +HRESULT WINAPI IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg); +HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObject, BOOL bFocus); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -539,6 +539,8 @@ #define SMC_EXEC 4 INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); + +HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv); static inline ULONG Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)

10 years

[dquintana] 65697: [SEHLL32] * Implement handling of file associations marked as "NoOpen". Patch by Lee Schroeder, with a few tweaks. CORE-8855 #resolve #comment Commited in trunk r65697. Thanks.

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Dec 17 00:46:30 2014 New Revision: 65697 URL: http://svn.reactos.org/svn/reactos?rev=65697&view=rev Log: [SEHLL32] * Implement handling of file associations marked as "NoOpen". Patch by Lee Schroeder, with a few tweaks. CORE-8855 #resolve #comment Commited in trunk r65697. Thanks. Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -37,6 +37,7 @@ HKCR,".386","",0x00000000,"vxdfile" HKCR,".vxd","",0x00000000,"vxdfile" HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" +HKCR,"vxdfile","NoOpen",0x00000000,"" HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157" ; Animated Cursors @@ -86,6 +87,7 @@ ; Dynamic Link Libraries HKCR,".dll","",0x00000000,"dllfile" HKCR,"dllfile","",0x00000000,"Dynamic Link Library" +HKCR,"dllfile","NoOpen",0x00000000,"" HKCR,"dllfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-163" HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" @@ -260,6 +262,7 @@ ; System-Files HKCR,".sys","",0x00000000,"sysfile" HKCR,"sysfile","",0x00000000,"System File" +HKCR,"sysfile","NoOpen",0x00000000,"" HKCR,"regfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/COpenWit… ============================================================================== --- trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -57,6 +57,7 @@ static HICON GetIcon(SApp *pApp); static BOOL Execute(SApp *pApp, LPCWSTR pwszFilePath); static BOOL IsHidden(SApp *pApp); + inline BOOL IsNoOpen(VOID) { return m_bNoOpen; } BOOL LoadRecommended(LPCWSTR pwszFilePath); BOOL SetDefaultHandler(SApp *pApp, LPCWSTR pwszFilename); @@ -775,12 +776,14 @@ COpenWithDialog(const OPENASINFO *pInfo, COpenWithList *pAppList); ~COpenWithDialog(); static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + BOOL IsNoOpen(HWND hwnd); private: VOID Init(HWND hwnd); VOID AddApp(COpenWithList::SApp *pApp, BOOL bSelected); VOID Browse(); VOID Accept(); + static BOOL CALLBACK NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); COpenWithList::SApp *GetCurrentApp(); const OPENASINFO *m_pInfo; @@ -790,10 +793,11 @@ HTREEITEM m_hRecommend; HTREEITEM m_hOther; HIMAGELIST m_hImgList; + BOOL m_bNoOpen; }; COpenWithDialog::COpenWithDialog(const OPENASINFO *pInfo, COpenWithList *pAppList = NULL): - m_pInfo(pInfo), m_pAppList(pAppList), m_hImgList(NULL) + m_pInfo(pInfo), m_pAppList(pAppList), m_hImgList(NULL), m_bNoOpen(FALSE) { if (!m_pAppList) { @@ -810,6 +814,53 @@ delete m_pAppList; if (m_hImgList) ImageList_Destroy(m_hImgList); +} + +BOOL CALLBACK COpenWithDialog::NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + { + return TRUE; + } + case WM_CLOSE: + EndDialog(hwnd, IDNO); + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDYES: + EndDialog(hwnd, IDYES); + break; + case IDNO: + EndDialog(hwnd, IDNO); + break; + } + break; + default: + return FALSE; + } + return TRUE; +} + +BOOL COpenWithDialog::IsNoOpen(HWND hwnd) +{ + /* Only do the actual check if the file type has the 'NoOpen' flag. */ + if (m_bNoOpen) + { + int dReturnValue = DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_NOOPEN), hwnd, NoOpenDlgProc); + + if (dReturnValue == IDNO) + return TRUE; + else if (dReturnValue == -1) + { + ERR("IsNoOpen failed to load the dialog box."); + return TRUE; + } + } + + return FALSE; } VOID COpenWithDialog::AddApp(COpenWithList::SApp *pApp, BOOL bSelected) @@ -923,6 +974,10 @@ /* Load applications from registry */ m_pAppList->Load(); m_pAppList->LoadRecommended(m_pInfo->pcszFile); + + /* Determine if the type of file can be opened directly from the shell */ + if (m_pAppList->IsNoOpen() != FALSE) + m_bNoOpen = TRUE; /* Init treeview */ m_hTreeView = GetDlgItem(hwnd, 14002); @@ -1395,6 +1450,9 @@ return E_FAIL; } + if (pDialog.IsNoOpen(hwndParent)) + return S_OK; + ShowWindow(hwnd, SW_SHOWNORMAL); while (GetMessage(&msg, NULL, 0, 0) && IsWindow(hwnd)) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -612,6 +612,20 @@ PUSHBUTTON "Storno", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -612,6 +612,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -623,6 +623,20 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -623,6 +623,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Annuler", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Annulla", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Avbryt", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Anuluj", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -608,6 +608,20 @@ PUSHBUTTON "A&nuleazÄ", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -608,6 +608,20 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -610,6 +610,20 @@ PUSHBUTTON "Anulo", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -615,6 +615,20 @@ PUSHBUTTON "åæ¶", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -614,6 +614,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -288,16 +288,17 @@ #define IDD_OPEN_WITH 24 #define IDD_FORMAT_DRIVE 25 #define IDD_CHECK_DISK 26 +#define IDD_NOOPEN 27 /* Not used dialogs */ -#define IDD_FILE_COPY 27 -#define IDD_SHUTDOWN 28 -#define IDD_LOG_OFF 29 -#define IDD_DISCONNECT 30 -#define IDD_CONFIRM_FILE_REPLACE 31 -#define IDD_AUTOPLAY1 32 -#define IDD_MIXED_CONTENT1 33 -#define IDD_MIXED_CONTENT2 34 +#define IDD_FILE_COPY 28 +#define IDD_SHUTDOWN 29 +#define IDD_LOG_OFF 30 +#define IDD_DISCONNECT 31 +#define IDD_CONFIRM_FILE_REPLACE 32 +#define IDD_AUTOPLAY1 33 +#define IDD_MIXED_CONTENT1 34 +#define IDD_MIXED_CONTENT2 35 /* Icons */ #define IDI_SHELL_DOCUMENT 1

10 years

[hbelusca] 65696: [WIN32K] - Simplify NtUserInitialize: we can check whether gpepCSRSS is != NULL to see if we are initialized or not (instead of using gbInitialized). - The UserInitialize helper d...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 17 00:33:40 2014 New Revision: 65696 URL: http://svn.reactos.org/svn/reactos?rev=65696&view=rev Log: [WIN32K] - Simplify NtUserInitialize: we can check whether gpepCSRSS is != NULL to see if we are initialized or not (instead of using gbInitialized). - The UserInitialize helper doesn't need to take parameters. The two event handles (power and media, used when we receive a power event -- for sleep, etc... -- and a media event -- like USB key insertion and such --) just need to be used in the not-yet-implemented "Initialize Power Request List" and "Initialize Media Change" steps. - Something that should be done is to bugcheck if the USER version reported is != 5.0 (as windows does). [WINSRV] - Collapse common inclusions from usersrv and consrv into the common header winsrv.h. [USERSRV] - _UserSoundSentry is NTAPI - Stub UserClientConnect (Timo's patch contains more involved code. I will commit it later). - Our NtUserInitialize(0, NULL, NULL); call (that made Windows BSOD) is wrong. It should be done with its first parameter correctly set to the USER version (5.0) and the two other parameters are handles to power and media events (see above). We should create them before. This is part of patch by Timo Kreuzer. CORE-7505 #comment UserClientConnect stubbed (it should be better implemented, I will commit the code from the patch later on); power&media events initialized; NtUserInitialize corrected. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/usersrv/api.h trunk/reactos/win32ss/user/winsrv/usersrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h trunk/reactos/win32ss/user/winsrv/winsrv.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -1029,6 +1029,9 @@ DWORD dwDispatchCount; SHAREDINFO siClient; } USERCONNECT, *PUSERCONNECT; + +// WinNT 5.0 compatible user32 / win32k +#define USER_VERSION MAKELONG(0x0000, 0x0005) typedef struct tagGETCLIPBDATA { Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -697,7 +697,7 @@ { /* Make sure that the first syscall is NtUserInitialize */ /* too bad this fails */ - //ASSERT(gbInitialized); + // ASSERT(gpepCSRSS); UserDbgAssertThreadInfo(TRUE); Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -890,7 +890,6 @@ IN USERTHREADINFOCLASS ThreadInformationClass, IN PVOID ThreadInformation, IN ULONG ThreadInformationLength) - { NTSTATUS Status = STATUS_SUCCESS; PETHREAD Thread; Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -17,7 +17,6 @@ ATOM AtomWndObj; // Window Object atom. ATOM AtomLayer; // Window Layer atom. ATOM AtomFlashWndState; // Window Flash State atom. -BOOL gbInitialized; HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; PEPROCESS gpepCSRSS = NULL; @@ -98,9 +97,7 @@ NTSTATUS NTAPI -UserInitialize( - HANDLE hPowerRequestEvent, - HANDLE hMediaRequestEvent) +UserInitialize(VOID) { static const DWORD wPattern55AA[] = /* 32 bit aligned */ { 0x55555555, 0xaaaaaaaa, 0x55555555, 0xaaaaaaaa, @@ -153,7 +150,7 @@ } /* - Called from win32csr. + * Called from usersrv. */ NTSTATUS APIENTRY @@ -167,27 +164,26 @@ TRACE("Enter NtUserInitialize(%lx, %p, %p)\n", dwWinVersion, hPowerRequestEvent, hMediaRequestEvent); - /* Check the Windows version */ - if (dwWinVersion != 0) + /* Check if we are already initialized */ + if (gpepCSRSS) + return STATUS_UNSUCCESSFUL; + + /* Check Windows USER subsystem version */ + if (dwWinVersion != USER_VERSION) { + // FIXME: Should bugcheck! return STATUS_UNSUCCESSFUL; } /* Acquire exclusive lock */ UserEnterExclusive(); - /* Check if we are already initialized */ - if (gbInitialized) - { - UserLeave(); - return STATUS_UNSUCCESSFUL; - } - - /* Save EPROCESS of CSRSS */ + /* Save the EPROCESS of CSRSS */ gpepCSRSS = PsGetCurrentProcess(); -// Initialize Power Request List. -// Initialize Media Change. +// Initialize Power Request List (use hPowerRequestEvent). +// Initialize Media Change (use hMediaRequestEvent). + // InitializeGreCSRSS(); // { // Startup DxGraphics. @@ -196,10 +192,7 @@ // } /* Initialize USER */ - Status = UserInitialize(hPowerRequestEvent, hMediaRequestEvent); - - /* Set us as initialized */ - gbInitialized = TRUE; + Status = UserInitialize(); /* Return */ UserLeave(); Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -9,7 +9,6 @@ #define UserEnterCo UserEnterExclusive #define UserLeaveCo UserLeave -extern BOOL gbInitialized; extern PSERVERINFO gpsi; extern PTHREADINFO gptiCurrent; extern PPROCESSINFO gppiList; Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -22,7 +22,6 @@ #include <wincon.h> #define NTOS_MODE_USER -#include <ndk/exfuncs.h> #include <ndk/mmfuncs.h> /* CONSOLE Headers */ Modified: trunk/reactos/win32ss/user/winsrv/usersrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -9,7 +9,7 @@ #pragma once /* init.c */ -BOOL WINAPI _UserSoundSentry(VOID); +BOOL NTAPI _UserSoundSentry(VOID); CSR_API(SrvCreateSystemThreads); CSR_API(SrvActivateDebugger); CSR_API(SrvGetThreadConsoleDesktop); Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -19,6 +19,10 @@ /* GLOBALS ********************************************************************/ HINSTANCE UserServerDllInstance = NULL; + +/* Handles for Power and Media events. Used by both usersrv and win32k. */ +HANDLE ghPowerRequestEvent; +HANDLE ghMediaRequestEvent; /* Memory */ HANDLE UserServerHeap = NULL; // Our own heap. @@ -84,7 +88,7 @@ /* FUNCTIONS ******************************************************************/ // PUSER_SOUND_SENTRY. Used in basesrv.dll -BOOL WINAPI _UserSoundSentry(VOID) +BOOL NTAPI _UserSoundSentry(VOID) { // TODO: Do something. return TRUE; @@ -128,6 +132,35 @@ { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UserClientConnect(IN PCSR_PROCESS CsrProcess, + IN OUT PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoLength) +{ + DPRINT1("UserClientConnect\n"); + +#if 0 + // NTSTATUS Status = STATUS_SUCCESS; + PBASESRV_API_CONNECTINFO ConnectInfo = (PBASESRV_API_CONNECTINFO)ConnectionInfo; + + if ( ConnectionInfo == NULL || + ConnectionInfoLength == NULL || + *ConnectionInfoLength != sizeof(*ConnectInfo) ) + { + DPRINT1("BASESRV: Connection failed - ConnectionInfo = 0x%p ; ConnectionInfoLength = 0x%p (%lu), expected %lu\n", + ConnectionInfo, + ConnectionInfoLength, + ConnectionInfoLength ? *ConnectionInfoLength : (ULONG)-1, + sizeof(*ConnectInfo)); + + return STATUS_INVALID_PARAMETER; + } +#else + return STATUS_SUCCESS; +#endif } CSR_SERVER_DLL_INIT(UserServerDllInitialization) @@ -141,9 +174,6 @@ /* Initialize the memory */ UserServerHeap = RtlGetProcessHeap(); - - /* Initialize the video */ - NtUserInitialize(0, NULL, NULL); /* Setup the DLL Object */ LoadedServerDll->ApiBase = USERSRV_FIRST_API_NUMBER; @@ -154,7 +184,7 @@ LoadedServerDll->NameTable = UserServerApiNameTable; #endif LoadedServerDll->SizeOfProcessData = 0; - LoadedServerDll->ConnectCallback = NULL; + LoadedServerDll->ConnectCallback = UserClientConnect; LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = UserServerHardError; LoadedServerDll->ShutdownProcessCallback = UserClientShutdown; @@ -175,9 +205,45 @@ NtClose(ServerThread); } else + { DPRINT1("Cannot start Raw Input Thread!\n"); + } } /*** END - From win32csr... ***/ + + /* Create the power request event */ + Status = NtCreateEvent(&ghPowerRequestEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Power request event creation failed with Status 0x%08x\n", Status); + return Status; + } + + /* Create the media request event */ + Status = NtCreateEvent(&ghMediaRequestEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Media request event creation failed with Status 0x%08x\n", Status); + return Status; + } + + /* Initialize the kernel mode subsystem */ + Status = NtUserInitialize(USER_VERSION, + ghPowerRequestEvent, + ghMediaRequestEvent); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtUserInitialize failed with Status 0x%08x\n", Status); + return Status; + } /* All done */ return STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -9,6 +9,9 @@ #ifndef __USERSRV_H__ #define __USERSRV_H__ +/* Main header */ +#include "../winsrv.h" + /* PSDK/NDK Headers */ #include <stdarg.h> @@ -16,21 +19,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> - -#define NTOS_MODE_USER -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> - -/* Public Win32K Headers */ -#include <ntuser.h> - -/* CSRSS Header */ -#include <csr/csrsrv.h> +// #define NTOS_MODE_USER /* USER Headers */ #include <win/winmsg.h> Modified: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -21,11 +21,13 @@ #include <winbase.h> #include <wingdi.h> #include <winuser.h> + /* Undocumented user definitions */ #include <undocuser.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h>

10 years

[dquintana] 65695: [SHELL32] * Revert r65589, since it breaks tray icons.

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Dec 17 00:32:34 2014 New Revision: 65695 URL: http://svn.reactos.org/svn/reactos?rev=65695&view=rev Log: [SHELL32] * Revert r65589, since it breaks tray icons. Modified: trunk/reactos/dll/win32/shell32/systray.cpp Modified: trunk/reactos/dll/win32/shell32/systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… ============================================================================== --- trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] Wed Dec 17 00:32:34 2014 @@ -50,8 +50,8 @@ data.lpData = pnotify_data; for(hwnd = 0; (hwnd = FindWindowExW(0, hwnd, L"Shell_TrayWnd", NULL)); ) - if ((unicode ? SendMessageTimeoutW : SendMessageTimeoutA)(hwnd, WM_COPYDATA, (WPARAM)nid_hwnd, (LPARAM)&data, SMTO_BLOCK|SMTO_ABORTIFHUNG, 4000, (PDWORD_PTR)&ret)) - return ret; + if ((unicode ? SendMessageW : SendMessageA)(hwnd, WM_COPYDATA, (WPARAM)nid_hwnd, (LPARAM)&data)) + ret = TRUE; return ret; }

10 years

[hbelusca] 65694: [WIN32K]: Some code formatting in csr.c before revampering it.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 17 00:17:44 2014 New Revision: 65694 URL: http://svn.reactos.org/svn/reactos?rev=65694&view=rev Log: [WIN32K]: Some code formatting in csr.c before revampering it. Modified: trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/win32ss/user/ntuser/csr.h Modified: trunk/reactos/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] Wed Dec 17 00:17:44 2014 @@ -1,49 +1,49 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/ntuser/csr.c + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Interface to CSRSS / USERSRV + * FILE: subsystems/win32/win32k/ntuser/csr.c * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) */ #include <win32k.h> static HANDLE WindowsApiPort = NULL; +// See gpepCSRSS in ntuser/ntuser.c and its initialization into NtUserInitialize() PEPROCESS CsrProcess = NULL; NTSTATUS FASTCALL CsrInit(void) { - NTSTATUS Status; - UNICODE_STRING PortName; - ULONG ConnectInfoLength; - SECURITY_QUALITY_OF_SERVICE Qos; + NTSTATUS Status; + UNICODE_STRING PortName; + ULONG ConnectInfoLength; + SECURITY_QUALITY_OF_SERVICE Qos; - RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); - ConnectInfoLength = 0; - Qos.Length = sizeof(Qos); - Qos.ImpersonationLevel = SecurityDelegation; - Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; - Qos.EffectiveOnly = FALSE; + RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); + ConnectInfoLength = 0; + Qos.Length = sizeof(Qos); + Qos.ImpersonationLevel = SecurityDelegation; + Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; + Qos.EffectiveOnly = FALSE; - Status = ZwConnectPort(&WindowsApiPort, - &PortName, - &Qos, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); - if (! NT_SUCCESS(Status)) - { - return Status; - } + Status = ZwConnectPort(&WindowsApiPort, + &PortName, + &Qos, + NULL, + NULL, + NULL, + NULL, + &ConnectInfoLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } - CsrProcess = PsGetCurrentProcess(); + CsrProcess = PsGetCurrentProcess(); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } - NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request) Modified: trunk/reactos/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.h?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.h [iso-8859-1] Wed Dec 17 00:17:44 2014 @@ -1,8 +1,8 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/include/csr.h + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Interface to CSRSS / USERSRV + * FILE: subsystems/win32/win32k/ntuser/csr.h * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) */ @@ -12,9 +12,5 @@ NTSTATUS FASTCALL CsrInit(void); NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); -NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); -NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle); /* EOF */

10 years

← Newer
1
...
20
21
22
23
24
25
26
...
39
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 December 2014