Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 65555: [EXPLORER] - Handle TWM_DOEXITWINDOWS in CTrayWindow. This message is sent from CDesktopWindow when it handles alt+f4 as an accelerator. - Also handle SC_CLOSE for WM_SYSCOMMA...
by gadamopoulos＠svn.reactos.org 03 Dec '14

03 Dec '14

Author: gadamopoulos Date: Wed Dec 3 17:16:53 2014 New Revision: 65555 URL: http://svn.reactos.org/svn/reactos?rev=65555&view=rev Log: [EXPLORER] - Handle TWM_DOEXITWINDOWS in CTrayWindow. This message is sent from CDesktopWindow when it handles alt+f4 as an accelerator. - Also handle SC_CLOSE for WM_SYSCOMMAND by calling ExitWindowsDialog. - Fixes pressing alt+f4 in xp - Now we have to make CDesktopWindow send TWM_DOEXITWINDOWS to the tray Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/traywnd.cpp 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 3 17:16:53 2014 @@ -159,6 +159,7 @@ */ #define TWM_OPENSTARTMENU (WM_USER + 260) +#define TWM_DOEXITWINDOWS (WM_USER + 342) extern const GUID IID_IShellDesktopTray; 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 3 17:16:53 2014 @@ -2611,6 +2611,32 @@ return TRUE; } + LRESULT DoExitWindows() + { + ExitWindowsDialog(m_hWnd); + return 0; + } + + LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + /* + * TWM_DOEXITWINDOWS is send by the CDesktopBrowserr to us to + * show the shutdown dialog + */ + return DoExitWindows(); + } + + LRESULT OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (wParam == SC_CLOSE) + { + return DoExitWindows(); + } + + bHandled = FALSE; + return TRUE; + } + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT Ret = FALSE; @@ -2675,13 +2701,7 @@ case IDM_SHUTDOWN: { - HINSTANCE hShell32; - EXITWINDLG ExitWinDlg; - - hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); - ExitWinDlg = (EXITWINDLG) GetProcAddress(hShell32, (LPCSTR) 60); - - ExitWinDlg(m_hWnd); + DoExitWindows(); break; } } @@ -2794,6 +2814,7 @@ /*MESSAGE_HANDLER(WM_DESTROY, OnDestroy)*/ MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(WM_SYSCOMMAND, OnSysCommand) MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) MESSAGE_HANDLER(WM_TIMER, OnTimer) @@ -2813,6 +2834,7 @@ MESSAGE_HANDLER(WM_NCMOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy) MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu) + MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) ALT_MSG_MAP(1) END_MSG_MAP()

1 0

[dquintana] 65554: [BROWSEUI] * Add a stubbed CExplorerBand, which I will be using to investigate how the windows shell implements the sidebar panels. This will never be called in ReactOS because o...
by dquintana＠svn.reactos.org 03 Dec '14

03 Dec '14

Author: dquintana Date: Wed Dec 3 16:11:46 2014 New Revision: 65554 URL: http://svn.reactos.org/svn/reactos?rev=65554&view=rev Log: [BROWSEUI] * Add a stubbed CExplorerBand, which I will be using to investigate how the windows shell implements the sidebar panels. This will never be called in ReactOS because our shell view doesn't handle the buttons for opening the sidebars, so it never asks the shell browser to open one. CORE-8815 Added: trunk/reactos/dll/win32/browseui/explorerband.cpp (with props) trunk/reactos/dll/win32/browseui/explorerband.h (with props) trunk/reactos/dll/win32/browseui/res/explorerband.rgs (with props) Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/resource.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Wed Dec 3 16:11:46 2014 @@ -22,6 +22,7 @@ browseuiord.cpp commonbrowser.cpp desktopipc.cpp + explorerband.cpp globalfoldersettings.cpp internettoolbar.cpp parsecmdline.cpp Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Wed Dec 3 16:11:46 2014 @@ -38,6 +38,7 @@ OBJECT_ENTRY(CLSID_GlobalFolderSettings, CGlobalFolderSettings) OBJECT_ENTRY(CLSID_InternetToolbar, CInternetToolbar) OBJECT_ENTRY(CLSID_CRegTreeOptions, CRegTreeOptions) +OBJECT_ENTRY(CLSID_ExplorerBand, CExplorerBand) END_OBJECT_MAP() CBrowseUIModule gModule; Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Wed Dec 3 16:11:46 2014 @@ -41,6 +41,7 @@ IDR_GLOBALFOLDERSETTINGS REGISTRY "res/globalfoldersettings.rgs" IDR_INTERNETTOOLBAR REGISTRY "res/internettoolbar.rgs" IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" +IDR_EXPLORERBAND REGISTRY "res/explorerband.rgs" /* * Everything specific to any language goes Added: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp (added) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Wed Dec 3 16:11:46 2014 @@ -0,0 +1,698 @@ +#include "precomp.h" + +#if 1 +#undef UNIMPLEMENTED + +#define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__) +#endif + +extern "C" +HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv) +{ + return ShellObjectCreator<CExplorerBand>(riid, ppv); +} + +CExplorerBand::CExplorerBand() : + m_internalBand(NULL), + m_internalDeskBand(NULL), + m_internalObjectWithSite(NULL), + m_internalInputObject(NULL), + m_internalPersistStream(NULL), + m_internalOleCommandTarget(NULL), + m_internalServiceProvider(NULL), + m_internalBandNavigate(NULL), + m_internalWinEventHandler(NULL), + m_internalNamespaceProxy(NULL), + m_internalDispatch(NULL), + m_OnWinEventShown(FALSE) +{ + HRESULT hResult = CoCreateInstance(CLSID_ExplorerBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &m_internalBand)); + if (FAILED(hResult)) + { + ERR("Could not create internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IDeskBand, &m_internalDeskBand)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IDeskBand from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_internalObjectWithSite)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IObjectWithSite from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IInputObject, &m_internalInputObject)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IInputObject from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IPersistStream, &m_internalPersistStream)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IPersistStream from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + m_internalPersistStream = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_internalOleCommandTarget)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IOleCommandTarget from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + m_internalPersistStream = NULL; + m_internalOleCommandTarget = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_internalServiceProvider)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IServiceProvider from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + m_internalPersistStream = NULL; + m_internalOleCommandTarget = NULL; + m_internalServiceProvider = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IBandNavigate, &m_internalBandNavigate)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IBandNavigate from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + m_internalPersistStream = NULL; + m_internalOleCommandTarget = NULL; + m_internalServiceProvider = NULL; + m_internalBandNavigate = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_internalWinEventHandler)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface IWinEventHandler from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + m_internalPersistStream = NULL; + m_internalOleCommandTarget = NULL; + m_internalServiceProvider = NULL; + m_internalBandNavigate = NULL; + m_internalWinEventHandler = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(INamespaceProxy, &m_internalNamespaceProxy)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface INamespaceProxy from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + m_internalPersistStream = NULL; + m_internalOleCommandTarget = NULL; + m_internalServiceProvider = NULL; + m_internalBandNavigate = NULL; + m_internalWinEventHandler = NULL; + m_internalNamespaceProxy = NULL; + return; + } + hResult = m_internalBand->QueryInterface(IID_PPV_ARG(IDispatch, &m_internalDispatch)); + if (FAILED(hResult)) + { + ERR("Could not obtain interface INamespaceProxy from internal band (hr=%08lx).\n", hResult); + m_internalBand = NULL; + m_internalDeskBand = NULL; + m_internalObjectWithSite = NULL; + m_internalInputObject = NULL; + m_internalPersistStream = NULL; + m_internalOleCommandTarget = NULL; + m_internalServiceProvider = NULL; + m_internalBandNavigate = NULL; + m_internalWinEventHandler = NULL; + m_internalNamespaceProxy = NULL; + m_internalDispatch = NULL; + return; + } +} + +CExplorerBand::~CExplorerBand() +{ +} + +// *** IOleWindow methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::GetWindow(HWND *lphwnd) +{ + HRESULT hr; + if (m_internalDeskBand) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetWindow(HWND *lphwnd=%p)\n", lphwnd); + hr = m_internalDeskBand->GetWindow(lphwnd); + if (lphwnd) + DbgPrint("\t*lphwnd=%p\n", *lphwnd); + DbgPrint("CExplorerBand::GetWindow returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::ContextSensitiveHelp(BOOL fEnterMode) +{ + HRESULT hr; + if (m_internalDeskBand) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::ContextSensitiveHelp(BOOL fEnterMode=%s)\n", fEnterMode ? "TRUE" : "FALSE"); + hr = m_internalDeskBand->ContextSensitiveHelp(fEnterMode); + DbgPrint("CExplorerBand::ContextSensitiveHelp returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IDockingWindow methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::CloseDW(DWORD dwReserved) +{ + HRESULT hr; + if (m_internalDeskBand) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::CloseDW(DWORD dwReserved=%u)\n", dwReserved); + hr = m_internalDeskBand->CloseDW(dwReserved); + DbgPrint("CExplorerBand::CloseDW returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + HRESULT hr; + if (m_internalDeskBand) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::ResizeBorderDW(const RECT *prcBorder=%p, IUnknown *punkToolbarSite=%p, BOOL fReserved=%s)\n", + prcBorder, punkToolbarSite, fReserved ? "TRUE" : "FALSE"); + if (prcBorder) + DbgPrint("\t*prcBorder={%u, %u, %u, %u}\n", prcBorder->left, prcBorder->top, prcBorder->right, prcBorder->bottom); + hr = m_internalDeskBand->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); + DbgPrint("CExplorerBand::ResizeBorderDW returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::ShowDW(BOOL fShow) +{ + HRESULT hr; + if (m_internalDeskBand) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::ShowDW(BOOL fShow=%s)\n", fShow ? "TRUE" : "FALSE"); + hr = m_internalDeskBand->ShowDW(fShow); + DbgPrint("CExplorerBand::ShowDW returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IDeskBand methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) +{ + HRESULT hr; + if (m_internalDeskBand) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetBandInfo(DWORD dwBandID=%u, DWORD dwViewMode=%u, DESKBANDINFO *pdbi=%p)\n", + dwBandID, dwViewMode, pdbi); + if (pdbi) + DbgPrint("\t*pdbi={dwMask=%u, ...}\n", pdbi->dwMask); + hr = m_internalDeskBand->GetBandInfo(dwBandID, dwViewMode, pdbi); + if (pdbi) + DbgPrint("\t*pdbi={dwMask=%u, crBkgnd=%u, ...}\n", pdbi->dwMask, pdbi->crBkgnd); + DbgPrint("CExplorerBand::GetBandInfo returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IObjectWithSite methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::SetSite(IUnknown *pUnkSite) +{ + HRESULT hr; + if (m_internalObjectWithSite) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::SetSite(IUnknown *pUnkSite=%p)\n", pUnkSite); + hr = m_internalObjectWithSite->SetSite(pUnkSite); + DbgPrint("CExplorerBand::SetSite returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::GetSite(REFIID riid, void **ppvSite) +{ + HRESULT hr; + if (m_internalObjectWithSite) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetSite(REFIID riid=%s, void **ppvSite=%p)\n", wine_dbgstr_guid(&riid), ppvSite); + hr = m_internalObjectWithSite->GetSite(riid, ppvSite); + if (ppvSite) + DbgPrint("\t*ppvSite=%p\n", *ppvSite); + DbgPrint("CExplorerBand::GetSite returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IOleCommandTarget methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + HRESULT hr; + if (m_internalOleCommandTarget) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::QueryStatus(const GUID *pguidCmdGroup=%s, ULONG cCmds=%08x, OLECMD prgCmds []=%p, OLECMDTEXT *pCmdText=%p)\n", + wine_dbgstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + hr = m_internalOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); + DbgPrint("CExplorerBand::QueryStatus returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + HRESULT hr; + if (m_internalOleCommandTarget) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::Exec(const GUID *pguidCmdGroup=%s, DWORD nCmdID=%u, DWORD nCmdexecopt=%u, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", + wine_dbgstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); + hr = m_internalOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + DbgPrint("CExplorerBand::Exec returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IServiceProvider methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + HRESULT hr; + if (m_internalServiceProvider) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", + wine_dbgstr_guid(&guidService), wine_dbgstr_guid(&riid), ppvObject); + hr = m_internalServiceProvider->QueryService(guidService, riid, ppvObject); + if (ppvObject) + DbgPrint("\t*ppvObject=%p\n", *ppvObject); + DbgPrint("CExplorerBand::QueryService returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IInputObject methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + HRESULT hr; + if (m_internalInputObject) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::UIActivateIO(BOOL fActivate=%s, LPMSG lpMsg=%p)\n", + fActivate ? "TRUE" : "FALSE", lpMsg); + hr = m_internalInputObject->UIActivateIO(fActivate, lpMsg); + if (lpMsg) + DbgPrint("\t*lpMsg={hwnd=%p, message=%x, wParam=%x, lParam=%x, time=%x, pt={%u %u}}\n", + lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam, lpMsg->time, lpMsg->pt.x, lpMsg->pt.y); + DbgPrint("CExplorerBand::UIActivateIO returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO() +{ + HRESULT hr; + if (m_internalInputObject) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO()\n"); + hr = m_internalInputObject->HasFocusIO(); + DbgPrint("CExplorerBand::HasFocusIO returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) +{ + HRESULT hr; + if (m_internalInputObject) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", lpMsg); + hr = m_internalInputObject->TranslateAcceleratorIO(lpMsg); + if (lpMsg) + DbgPrint("\t*lpMsg={hwnd=%p, message=%x, wParam=%x, lParam=%x, time=%x, pt={%u %u}}\n", + lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam, lpMsg->time, lpMsg->pt.x, lpMsg->pt.y); + DbgPrint("CExplorerBand::TranslateAcceleratorIO returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IPersist methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::GetClassID(CLSID *pClassID) +{ + HRESULT hr; + if (m_internalPersistStream) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetClassID(CLSID *pClassID=%p)\n", pClassID); + hr = m_internalPersistStream->GetClassID(pClassID); + if (pClassID) + DbgPrint("\t*pClassID=%s\n", wine_dbgstr_guid(pClassID)); + DbgPrint("CExplorerBand::GetClassID returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IPersistStream methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::IsDirty() +{ + HRESULT hr; + if (m_internalPersistStream) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::IsDirty()\n"); + hr = m_internalPersistStream->IsDirty(); + DbgPrint("CExplorerBand::IsDirty returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::Load(IStream *pStm) +{ + HRESULT hr; + if (m_internalPersistStream) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::Load(IStream *pStm=%p)\n", pStm); + hr = m_internalPersistStream->Load(pStm); + DbgPrint("CExplorerBand::Load returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::Save(IStream *pStm, BOOL fClearDirty) +{ + HRESULT hr; + if (m_internalPersistStream) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::Save(IStream *pStm=%p, BOOL fClearDirty=%s)\n", + pStm, fClearDirty ? "TRUE" : "FALSE"); + hr = m_internalPersistStream->Save(pStm, fClearDirty); + DbgPrint("CExplorerBand::Save returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::GetSizeMax(ULARGE_INTEGER *pcbSize) +{ + HRESULT hr; + if (m_internalPersistStream) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetSizeMax(ULARGE_INTEGER *pcbSize=%p)\n", pcbSize); + hr = m_internalPersistStream->GetSizeMax(pcbSize); + if (pcbSize) + DbgPrint("\t*pcbSize=%llx\n", pcbSize->QuadPart); + DbgPrint("CExplorerBand::GetSizeMax returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IWinEventHandler methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + HRESULT hr; + if (m_internalWinEventHandler) + { + if (m_OnWinEventShown) + return m_internalWinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + m_OnWinEventShown = TRUE; + + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd=%x, UINT uMsg=%x, WPARAM wParam=%x, LPARAM lParam=%x, LRESULT *theResult=%p)\n", + hWnd, uMsg, wParam, lParam, theResult); + hr = m_internalWinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + if (theResult) + DbgPrint("\t*theResult=%x\n", *theResult); + DbgPrint("CExplorerBand::OnWinEvent returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::IsWindowOwner(HWND hWnd) +{ + HRESULT hr; + if (m_internalWinEventHandler) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::IsWindowOwner(HWND hWnd=%x)\n", hWnd); + hr = m_internalWinEventHandler->IsWindowOwner(hWnd); + DbgPrint("CExplorerBand::IsWindowOwner returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IBandNavigate methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::Select(long paramC) +{ + HRESULT hr; + if (m_internalBandNavigate) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::Select(long paramC=%x)\n", paramC); + hr = m_internalBandNavigate->Select(paramC); + DbgPrint("CExplorerBand::Select returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** INamespaceProxy *** +HRESULT STDMETHODCALLTYPE CExplorerBand::GetNavigateTarget(long paramC, long param10, long param14) +{ + HRESULT hr; + if (m_internalNamespaceProxy) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetNavigateTarget(long paramC=%08x, long param10=%08x, long param14=%08x)\n", + paramC, param10, param14); + hr = m_internalNamespaceProxy->GetNavigateTarget(paramC, param10, param14); + DbgPrint("CExplorerBand::GetNavigateTarget returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::Invoke(long paramC) +{ + HRESULT hr; + if (m_internalNamespaceProxy) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::Invoke(long paramC=%08x)\n", paramC); + hr = m_internalNamespaceProxy->Invoke(paramC); + DbgPrint("CExplorerBand::Invoke returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::OnSelectionChanged(long paramC) +{ + HRESULT hr; + if (m_internalNamespaceProxy) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::OnSelectionChanged(long paramC=%08x)\n", paramC); + hr = m_internalNamespaceProxy->OnSelectionChanged(paramC); + DbgPrint("CExplorerBand::OnSelectionChanged returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::RefreshFlags(long paramC, long param10, long param14) +{ + HRESULT hr; + if (m_internalNamespaceProxy) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::RefreshFlags(long paramC=%08x, long param10=%08x, long param14=%08x)\n", + paramC, param10, param14); + hr = m_internalNamespaceProxy->RefreshFlags(paramC, param10, param14); + DbgPrint("CExplorerBand::RefreshFlags returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::CacheItem(long paramC) +{ + HRESULT hr; + if (m_internalNamespaceProxy) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::CacheItem(long paramC=%08x)\n", paramC); + hr = m_internalNamespaceProxy->CacheItem(paramC); + DbgPrint("CExplorerBand::CacheItem returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +// *** IDispatch methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::GetTypeInfoCount(UINT *pctinfo) +{ + HRESULT hr; + if (m_internalDispatch) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetTypeInfoCount(UINT *pctinfo=%p)\n", pctinfo); + hr = m_internalDispatch->GetTypeInfoCount(pctinfo); + if (pctinfo) + DbgPrint("\t*pctinfo=%08x\n", *pctinfo); + DbgPrint("CExplorerBand::GetTypeInfoCount returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HRESULT hr; + if (m_internalDispatch) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetTypeInfo(UINT iTInfo=%u, LCID lcid=%08x, ITypeInfo **ppTInfo=%p)\n", + iTInfo, lcid, ppTInfo); + hr = m_internalDispatch->GetTypeInfo(iTInfo, lcid, ppTInfo); + if (ppTInfo) + DbgPrint("\t*ppTInfo=%08x\n", *ppTInfo); + DbgPrint("CExplorerBand::GetTypeInfo returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HRESULT hr; + if (m_internalDispatch) + { + DbgPrint("HRESULT STDMETHODCALLTYPE CExplorerBand::GetIDsOfNames(REFIID riid=%s, LPOLESTR *rgszNames=%S, UINT cNames=%u, LCID lcid=%08x, DISPID *rgDispId=%p)\n", + wine_dbgstr_guid(&riid), rgszNames, cNames, lcid, rgDispId); + hr = m_internalDispatch->GetIDsOfNames(riid, rgszNames, cNames, lcid, rgDispId); + if (rgDispId && SUCCEEDED(hr)) + { + for (UINT i = 0; i < cNames; i++) + { + DbgPrint("\trgDispId[%d]=%08x\n", rgDispId[i]); + } + } + DbgPrint("CExplorerBand::GetTypeInfo returning %08lx\n", hr); + return hr; + } + + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + Propchange: trunk/reactos/dll/win32/browseui/explorerband.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h (added) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Wed Dec 3 16:11:46 2014 @@ -0,0 +1,227 @@ +#pragma once + +#if 0 +// Is this a CToolsBand that implements a toolbar? +class CToolBand : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDeskBand, + public IObjectWithSite, + public IInputObject, + public IPersistStream, + public IOleCommandTarget, + public IServiceProvider +{ +public: + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IDockingWindow methods *** + virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); + virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); + virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); + + // *** IDeskBand methods *** + virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IPersist methods *** + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); + + // *** IPersistStream methods *** + virtual HRESULT STDMETHODCALLTYPE IsDirty(); + virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); + virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); + virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); + + BEGIN_COM_MAP(CToolBand) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + END_COM_MAP() +}; + +class CNSCBand : + public CToolBand, + public IDeskBand, + public IObjectWithSite, + public IInputObject, + public IPersistStream, + public IOleCommandTarget, + public IServiceProvider, + public IBandNavigate, + public IWinEventHandler, + public INamespaceProxy +{ +public: + // *** IWinEventHandler methods *** + virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); + + // *** IBandNavigate methods *** + virtual HRESULT STDMETHODCALLTYPE Select(long paramC); + + // *** INamespaceProxy *** + virtual HRESULT STDMETHODCALLTYPE GetNavigateTarget(long paramC, long param10, long param14); + virtual HRESULT STDMETHODCALLTYPE Invoke(long paramC); + virtual HRESULT STDMETHODCALLTYPE OnSelectionChanged(long paramC); + virtual HRESULT STDMETHODCALLTYPE RefreshFlags(long paramC, long param10, long param14); + virtual HRESULT STDMETHODCALLTYPE CacheItem(long paramC); + + BEGIN_COM_MAP(CNSCBand) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IBandNavigate, IBandNavigate) + COM_INTERFACE_ENTRY_IID(IID_INamespaceProxy, INamespaceProxy) +#if 0 + COM_INTERFACE_ENTRY_CHAIN(CToolBand) +#else + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) +#endif + END_COM_MAP() +}; +#endif + +class CExplorerBand : + public CComCoClass<CExplorerBand, &CLSID_ExplorerBand>, +#if 0 + public CNSCBand, +#else + public CComObjectRootEx<CComMultiThreadModelNoCS>, +#endif + public IDeskBand, + public IObjectWithSite, + public IInputObject, + public IPersistStream, + public IOleCommandTarget, + public IServiceProvider, + public IBandNavigate, + public IWinEventHandler, + public INamespaceProxy +{ + CComPtr<IUnknown> m_internalBand; + + CComPtr<IDeskBand> m_internalDeskBand; + CComPtr<IObjectWithSite> m_internalObjectWithSite; + CComPtr<IInputObject> m_internalInputObject; + CComPtr<IPersistStream> m_internalPersistStream; + CComPtr<IOleCommandTarget> m_internalOleCommandTarget; + CComPtr<IServiceProvider> m_internalServiceProvider; + CComPtr<IBandNavigate> m_internalBandNavigate; + CComPtr<IWinEventHandler> m_internalWinEventHandler; + CComPtr<INamespaceProxy> m_internalNamespaceProxy; + CComPtr<IDispatch> m_internalDispatch; + + bool m_OnWinEventShown; +public: + CExplorerBand(); + virtual ~CExplorerBand(); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IDockingWindow methods *** + virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); + virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); + virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); + + // *** IDeskBand methods *** + virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IPersist methods *** + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); + + // *** IPersistStream methods *** + virtual HRESULT STDMETHODCALLTYPE IsDirty(); + virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); + virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); + virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); + + // *** IWinEventHandler methods *** + virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); + + // *** IBandNavigate methods *** + virtual HRESULT STDMETHODCALLTYPE Select(long paramC); + + // *** INamespaceProxy *** + virtual HRESULT STDMETHODCALLTYPE GetNavigateTarget(long paramC, long param10, long param14); + virtual HRESULT STDMETHODCALLTYPE Invoke(long paramC); + virtual HRESULT STDMETHODCALLTYPE OnSelectionChanged(long paramC); + virtual HRESULT STDMETHODCALLTYPE RefreshFlags(long paramC, long param10, long param14); + virtual HRESULT STDMETHODCALLTYPE CacheItem(long paramC); + + // *** IDispatch methods *** + virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); + virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); + virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); + virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); + + DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBAND) + DECLARE_NOT_AGGREGATABLE(CExplorerBand) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CExplorerBand) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IBandNavigate, IBandNavigate) + COM_INTERFACE_ENTRY_IID(IID_INamespaceProxy, INamespaceProxy) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + END_COM_MAP() +}; + +extern "C" +HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv); Propchange: trunk/reactos/dll/win32/browseui/explorerband.h ------------------------------------------------------------------------------ svn:eol-style = native 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 3 16:11:46 2014 @@ -41,6 +41,7 @@ #include "commonbrowser.h" #include "globalfoldersettings.h" #include "regtreeoptions.h" +#include "explorerband.h" #include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(browseui); Added: trunk/reactos/dll/win32/browseui/res/explorerband.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/exp… ============================================================================== --- trunk/reactos/dll/win32/browseui/res/explorerband.rgs (added) +++ trunk/reactos/dll/win32/browseui/res/explorerband.rgs [iso-8859-1] Wed Dec 3 16:11:46 2014 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {EFA24E64-B078-11D0-89E4-00C04FC9E26E} = s 'Explorer TreeView Band' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/browseui/res/explorerband.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resourc… ============================================================================== --- trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] Wed Dec 3 16:11:46 2014 @@ -77,6 +77,7 @@ #define IDR_INTERNETTOOLBAR 136 #define IDR_GLOBALFOLDERSETTINGS 137 #define IDR_REGTREEOPTIONS 138 +#define IDR_EXPLORERBAND 139 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 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 3 16:11:46 2014 @@ -23,6 +23,8 @@ #include <shellapi.h> #include <htiframe.h> #include <strsafe.h> + +#define USE_CUSTOM_EXPLORERBAND 1 extern "C" BOOL WINAPI Shell_GetImageLists( @@ -1179,9 +1181,24 @@ hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + +#if USE_CUSTOM_EXPLORERBAND + TRACE("ShowBand called for CLSID %s, vertical=%d...\n", wine_dbgstr_guid(&classID), vertical); + if (IsEqualCLSID(CLSID_ExplorerBand, classID)) + { + TRACE("CLSID_ExplorerBand requested, building internal band.\n"); + hResult = CExplorerBand_Constructor(IID_PPV_ARG(IUnknown, &newBand)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + else +#endif + { + TRACE("A different CLSID requested, using CoCreateInstance.\n"); + hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -1199,6 +1216,7 @@ hResult = dockingWindow->ShowDW(TRUE); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + return S_OK; }

1 0

[akhaldi] 65553: [KBDES] Please Ismael Ferreras Morezuelas (swyter) with these mostly formatting changes. CORE-8848
by akhaldi＠svn.reactos.org 03 Dec '14

03 Dec '14

Author: akhaldi Date: Wed Dec 3 11:40:37 2014 New Revision: 65553 URL: http://svn.reactos.org/svn/reactos?rev=65553&view=rev Log: [KBDES] Please Ismael Ferreras Morezuelas (swyter) with these mostly formatting changes. CORE-8848 Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.c Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] Wed Dec 3 11:40:37 2014 @@ -1,12 +1,14 @@ ï»¿/* * ReactOS Spanish Keyboard Layout - * Copyright (C) 2003 ReactOS + * Copyright (C) 2003-2014 ReactOS * License: LGPL, see: LGPL.txt - * Created by HUMA2000 from kbdus, kbdgr, kbdda and kbdfr - * huma2000(a)terra.es - * Thanks to arty for the kbtest utility and help - * Thanks to carraca from reactos.com forum for his fixes - * Thanks Elrond for help + * + * (c) 2003 - Created by HUMA2000 <huma2000(a)terra.es> from kbdus, kbdgr, kbdda and kbdfr. + * (c) 2014 - Updated by Swyter <swyterzone+ros(a)gmail.com> + * + * Thanks to: arty, for the kbtest utility and help. + * Thanks to: carraca, from reactos.com forum for his fixes. + * Thanks to: Elrond, for help. * * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html @@ -19,389 +21,407 @@ #include <ndk/kbd.h> #ifdef _M_IA64 -#define ROSDATA static __declspec(allocate(".data")) + #define ROSDATA static __declspec(allocate(".data")) #else -#ifdef _MSC_VER -#pragma data_seg(".data") -#define ROSDATA static -#else -#define ROSDATA static __attribute__((section(".data"))) + #ifdef _MSC_VER + #pragma data_seg(".data") + #define ROSDATA static + #else + #define ROSDATA static __attribute__((section(".data"))) + #endif #endif -#endif - -#define VK_EMPTY 0xff /* The non-existent VK */ + +#define VK_EMPTY 0xff /* The non-existent VK */ #define KNUMS KBDNUMPAD|KBDSPECIAL /* Special + number pad */ #define KMEXT KBDEXT|KBDMULTIVK /* Multi + ext */ -ROSDATA USHORT scancode_to_vk[] = { -/* 00 */ VK_EMPTY, -/* 01 */ VK_ESCAPE, -/* 02 */ '1', -/* 03 */ '2', -/* 04 */ '3', -/* 05 */ '4', -/* 06 */ '5', -/* 07 */ '6', -/* 08 */ '7', -/* 09 */ '8', -/* 0a */ '9', -/* 0b */ '0', -/* 0c */ VK_OEM_4, -/* 0d */ VK_OEM_6, -/* 0e */ VK_BACK, -/* 0f */ VK_TAB, -/* 10 */ 'Q', -/* 11 */ 'W', -/* 12 */ 'E', -/* 13 */ 'R', -/* 14 */ 'T', -/* 15 */ 'Y', -/* 16 */ 'U', -/* 17 */ 'I', -/* 18 */ 'O', -/* 19 */ 'P', -/* 1a */ VK_OEM_1, -/* 1b */ VK_OEM_PLUS, -/* 1c */ VK_RETURN, -/* 1d */ VK_LCONTROL, -/* 1e */ 'A', -/* 1f */ 'S', -/* 20 */ 'D', -/* 21 */ 'F', -/* 22 */ 'G', -/* 23 */ 'H', -/* 24 */ 'J', -/* 25 */ 'K', -/* 26 */ 'L', -/* 27 */ VK_OEM_3, -/* 28 */ VK_OEM_7, -/* 29 */ VK_OEM_5, -/* 2a */ VK_LSHIFT, -/* 2b */ VK_OEM_2, -/* 2c */ 'Z', -/* 2d */ 'X', -/* 2e */ 'C', -/* 2f */ 'V', -/* 30 */ 'B', -/* 31 */ 'N', -/* 32 */ 'M', -/* 33 */ VK_OEM_COMMA, -/* 34 */ VK_OEM_PERIOD, -/* 35 */ VK_OEM_MINUS, -/* 36 */ VK_RSHIFT, -/* 37 */ VK_MULTIPLY, -/* 38 */ VK_LMENU, -/* 39 */ VK_SPACE, -/* 3a */ VK_CAPITAL, -/* 3b */ VK_F1, -/* 3c */ VK_F2, -/* 3d */ VK_F3, -/* 3e */ VK_F4, -/* 3f */ VK_F5, -/* 40 */ VK_F6, -/* 41 */ VK_F7, -/* 42 */ VK_F8, -/* 43 */ VK_F9, -/* 44 */ VK_F10, -/* 45 */ VK_NUMLOCK | KMEXT, -/* 46 */ VK_SCROLL | KBDMULTIVK, -/* 47 */ VK_HOME | KNUMS, -/* 48 */ VK_UP | KNUMS, -/* 49 */ VK_PRIOR | KNUMS, -/* 4a */ VK_SUBTRACT, -/* 4b */ VK_LEFT | KNUMS, -/* 4c */ VK_CLEAR | KNUMS, -/* 4d */ VK_RIGHT | KNUMS, -/* 4e */ VK_ADD, -/* 4f */ VK_END | KNUMS, -/* 50 */ VK_DOWN | KNUMS, -/* 51 */ VK_NEXT | KNUMS, -/* 52 */ VK_INSERT | KNUMS, -/* 53 */ VK_DELETE | KNUMS, -/* 54 */ VK_SNAPSHOT, -/* 55 */ VK_EMPTY, -/* 56 */ VK_OEM_102, -/* 57 */ VK_F11, -/* 58 */ VK_F12, -/* 59 */ VK_EMPTY, -/* 5a */ VK_CLEAR, -/* 5b */ VK_EMPTY, -/* 5c */ VK_EMPTY, -/* 5d */ VK_EMPTY, -/* 5e */ VK_EMPTY, /* EREOF */ -/* 5f */ VK_EMPTY, -/* 60 */ VK_EMPTY, -/* 61 */ VK_EMPTY, -/* 62 */ VK_EMPTY, -/* 63 */ VK_EMPTY, /* ZOOM */ -/* 64 */ VK_HELP, -/* 65 */ VK_F13, -/* 66 */ VK_F14, -/* 67 */ VK_F15, -/* 68 */ VK_F16, -/* 69 */ VK_F17, -/* 6a */ VK_F18, -/* 6b */ VK_F19, -/* 6c */ VK_F20, -/* 6d */ VK_F21, -/* 6e */ VK_F22, -/* 6f */ VK_F23, -/* 70 */ VK_EMPTY, -/* 71 */ VK_EMPTY, -/* 72 */ VK_EMPTY, -/* 73 */ VK_EMPTY, -/* 74 */ VK_EMPTY, -/* 75 */ VK_EMPTY, -/* 76 */ VK_EMPTY, -/* 77 */ VK_F24, -/* 78 */ VK_EMPTY, -/* 79 */ VK_EMPTY, -/* 7a */ VK_EMPTY, -/* 7b */ VK_EMPTY, -/* 7c */ VK_EMPTY, -/* 7d */ VK_EMPTY, -/* 7e */ VK_EMPTY, -/* 7f */ VK_EMPTY, -/* 80 */ VK_EMPTY, -/* 00 */ 0 -}; - -ROSDATA VSC_VK extcode0_to_vk[] = { - { 0x10, VK_MEDIA_PREV_TRACK | KBDEXT }, // Pista anterior, no puedo probarlo hasta que no se implemente el sonido - { 0x19, VK_MEDIA_NEXT_TRACK | KBDEXT }, // Pista siguiente, - { 0x1D, VK_RCONTROL | KBDEXT }, // Tecla control - { 0x20, VK_VOLUME_MUTE | KBDEXT }, // Silenciar volumen - { 0x21, VK_LAUNCH_APP2 | KBDEXT }, // Tecla calculadora - { 0x22, VK_MEDIA_PLAY_PAUSE | KBDEXT }, // Play/pause - { 0x24, VK_MEDIA_STOP | KBDEXT }, // Stop - { 0x2E, VK_VOLUME_DOWN | KBDEXT }, // Bajar volumen - { 0x30, VK_VOLUME_UP | KBDEXT }, // Subir volumen - { 0x32, VK_BROWSER_HOME | KBDEXT }, // Pagina de inicio del navegador de internet o abrirlo si no esta activolo - { 0x35, VK_DIVIDE | KBDEXT }, // Tecla - { 0x37, VK_SNAPSHOT | KBDEXT }, // La tecla de imprimir pantalla - { 0x38, VK_RMENU | KBDEXT }, // Tecla alt - { 0x47, VK_HOME | KBDEXT }, // Tecla inicio - { 0x48, VK_UP | KBDEXT }, // Cursor arriba - { 0x49, VK_PRIOR | KBDEXT }, // Tecla Re pag - { 0x4B, VK_LEFT | KBDEXT }, // Cursor izquierda - { 0x4D, VK_RIGHT | KBDEXT }, // Cursor derecha - { 0x4F, VK_END | KBDEXT }, // Tecla Fin - { 0x50, VK_DOWN | KBDEXT }, // Cursor abajo - { 0x51, VK_NEXT | KBDEXT }, // Tecla Av pag - { 0x52, VK_INSERT | KBDEXT }, // Tecla insertar - { 0x53, VK_DELETE | KBDEXT }, // Tecla deletear - { 0x5B, VK_LWIN | KBDEXT }, // Tecla windows izquierda - { 0x5C, VK_RWIN | KBDEXT }, // Tecla windows derecha - { 0x5D, VK_APPS | KBDEXT }, // Tecla menu aplicacion derecha - { 0x5F, VK_SLEEP | KBDEXT }, // Tecla Sleep - { 0x65, VK_BROWSER_SEARCH | KBDEXT }, // Pagina de bÃºsqueda en el navegador de internet - { 0x66, VK_BROWSER_FAVORITES | KBDEXT }, // Favoritos, tengo que esperar a que el tcp/ip - { 0x67, VK_BROWSER_REFRESH | KBDEXT }, // Refrescar el navegador de internet - { 0x68, VK_BROWSER_STOP | KBDEXT }, // Stop en el navegador de internet - { 0x69, VK_BROWSER_FORWARD | KBDEXT }, // Adelante en el navegador de internet - { 0x6A, VK_BROWSER_BACK | KBDEXT }, // AtrÃ¡s en el navegador de internet - { 0x6B, VK_LAUNCH_APP1 | KBDEXT }, // Tecla Mi pc - { 0x6C, VK_LAUNCH_MAIL | KBDEXT }, // Abrir programa de e-mail - { 0x6D, VK_LAUNCH_MEDIA_SELECT | KBDEXT }, // Abrir reproductor multimedia - { 0x1C, VK_RETURN | KBDEXT }, // La tecla de intro - { 0x46, VK_CANCEL | KBDEXT }, // Tecla escape +ROSDATA USHORT scancode_to_vk[] = +{ + /* 00 */ VK_EMPTY, + /* 01 */ VK_ESCAPE, + /* 02 */ L'1', + /* 03 */ L'2', + /* 04 */ L'3', + /* 05 */ L'4', + /* 06 */ L'5', + /* 07 */ L'6', + /* 08 */ L'7', + /* 09 */ L'8', + /* 0a */ L'9', + /* 0b */ L'0', + /* 0c */ VK_OEM_4, + /* 0d */ VK_OEM_6, + /* 0e */ VK_BACK, + /* 0f */ VK_TAB, + /* 10 */ L'Q', + /* 11 */ L'W', + /* 12 */ L'E', + /* 13 */ L'R', + /* 14 */ L'T', + /* 15 */ L'Y', + /* 16 */ L'U', + /* 17 */ L'I', + /* 18 */ L'O', + /* 19 */ L'P', + /* 1a */ VK_OEM_1, + /* 1b */ VK_OEM_PLUS, + /* 1c */ VK_RETURN, + /* 1d */ VK_LCONTROL, + /* 1e */ L'A', + /* 1f */ L'S', + /* 20 */ L'D', + /* 21 */ L'F', + /* 22 */ L'G', + /* 23 */ L'H', + /* 24 */ L'J', + /* 25 */ L'K', + /* 26 */ L'L', + /* 27 */ VK_OEM_3, + /* 28 */ VK_OEM_7, + /* 29 */ VK_OEM_5, + /* 2a */ VK_LSHIFT, + /* 2b */ VK_OEM_2, + /* 2c */ L'Z', + /* 2d */ L'X', + /* 2e */ L'C', + /* 2f */ L'V', + /* 30 */ L'B', + /* 31 */ L'N', + /* 32 */ L'M', + /* 33 */ VK_OEM_COMMA, + /* 34 */ VK_OEM_PERIOD, + /* 35 */ VK_OEM_MINUS, + /* 36 */ VK_RSHIFT, + /* 37 */ VK_MULTIPLY, + /* 38 */ VK_LMENU, + /* 39 */ VK_SPACE, + /* 3a */ VK_CAPITAL, + /* 3b */ VK_F1, + /* 3c */ VK_F2, + /* 3d */ VK_F3, + /* 3e */ VK_F4, + /* 3f */ VK_F5, + /* 40 */ VK_F6, + /* 41 */ VK_F7, + /* 42 */ VK_F8, + /* 43 */ VK_F9, + /* 44 */ VK_F10, + /* 45 */ VK_NUMLOCK | KMEXT, + /* 46 */ VK_SCROLL | KBDMULTIVK, + /* 47 */ VK_HOME | KNUMS, + /* 48 */ VK_UP | KNUMS, + /* 49 */ VK_PRIOR | KNUMS, + /* 4a */ VK_SUBTRACT, + /* 4b */ VK_LEFT | KNUMS, + /* 4c */ VK_CLEAR | KNUMS, + /* 4d */ VK_RIGHT | KNUMS, + /* 4e */ VK_ADD, + /* 4f */ VK_END | KNUMS, + /* 50 */ VK_DOWN | KNUMS, + /* 51 */ VK_NEXT | KNUMS, + /* 52 */ VK_INSERT | KNUMS, + /* 53 */ VK_DELETE | KNUMS, + /* 54 */ VK_SNAPSHOT, + /* 55 */ VK_EMPTY, + /* 56 */ VK_OEM_102, + /* 57 */ VK_F11, + /* 58 */ VK_F12, + /* 59 */ VK_EMPTY, + /* 5a */ VK_CLEAR, + /* 5b */ VK_EMPTY, + /* 5c */ VK_EMPTY, + /* 5d */ VK_EMPTY, + /* 5e */ VK_EMPTY, /* EREOF */ + /* 5f */ VK_EMPTY, + /* 60 */ VK_EMPTY, + /* 61 */ VK_EMPTY, + /* 62 */ VK_EMPTY, + /* 63 */ VK_EMPTY, /* ZOOM */ + /* 64 */ VK_HELP, + /* 65 */ VK_F13, + /* 66 */ VK_F14, + /* 67 */ VK_F15, + /* 68 */ VK_F16, + /* 69 */ VK_F17, + /* 6a */ VK_F18, + /* 6b */ VK_F19, + /* 6c */ VK_F20, + /* 6d */ VK_F21, + /* 6e */ VK_F22, + /* 6f */ VK_F23, + /* 70 */ VK_EMPTY, + /* 71 */ VK_EMPTY, + /* 72 */ VK_EMPTY, + /* 73 */ VK_EMPTY, + /* 74 */ VK_EMPTY, + /* 75 */ VK_EMPTY, + /* 76 */ VK_EMPTY, + /* 77 */ VK_F24, + /* 78 */ VK_EMPTY, + /* 79 */ VK_EMPTY, + /* 7a */ VK_EMPTY, + /* 7b */ VK_EMPTY, + /* 7c */ VK_EMPTY, + /* 7d */ VK_EMPTY, + /* 7e */ VK_EMPTY, + /* 7f */ VK_EMPTY, + /* 80 */ VK_EMPTY, + /* 00 */ 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = +{ + { 0x10, KBDEXT | VK_MEDIA_PREV_TRACK }, // Pista anterior, no puedo probarlo hasta que no se implemente el sonido + { 0x19, KBDEXT | VK_MEDIA_NEXT_TRACK }, // Pista siguiente, + { 0x1D, KBDEXT | VK_RCONTROL }, // Tecla control + { 0x20, KBDEXT | VK_VOLUME_MUTE }, // Silenciar volumen + { 0x21, KBDEXT | VK_LAUNCH_APP2 }, // Tecla calculadora + { 0x22, KBDEXT | VK_MEDIA_PLAY_PAUSE }, // Reproducir/Pausa + { 0x24, KBDEXT | VK_MEDIA_STOP }, // Stop + { 0x2E, KBDEXT | VK_VOLUME_DOWN }, // Bajar volumen + { 0x30, KBDEXT | VK_VOLUME_UP }, // Subir volumen + { 0x32, KBDEXT | VK_BROWSER_HOME }, // Pagina de inicio del navegador de Internet o abrirlo si no esta activo + { 0x35, KBDEXT | VK_DIVIDE }, // Tecla + { 0x37, KBDEXT | VK_SNAPSHOT }, // La tecla de imprimir pantalla + { 0x38, KBDEXT | VK_RMENU }, // Tecla Alt + { 0x47, KBDEXT | VK_HOME }, // Tecla inicio + { 0x48, KBDEXT | VK_UP }, // Cursor arriba + { 0x49, KBDEXT | VK_PRIOR }, // Tecla RepÃ¡g + { 0x4B, KBDEXT | VK_LEFT }, // Cursor izquierda + { 0x4D, KBDEXT | VK_RIGHT }, // Cursor derecha + { 0x4F, KBDEXT | VK_END }, // Tecla Fin + { 0x50, KBDEXT | VK_DOWN }, // Cursor abajo + { 0x51, KBDEXT | VK_NEXT }, // Tecla AvpÃ¡g + { 0x52, KBDEXT | VK_INSERT }, // Tecla Ins + { 0x53, KBDEXT | VK_DELETE }, // Tecla Supr + { 0x5B, KBDEXT | VK_LWIN }, // Tecla Windows izquierda + { 0x5C, KBDEXT | VK_RWIN }, // Tecla Windows derecha + { 0x5D, KBDEXT | VK_APPS }, // Tecla menÃº aplicacion derecha + { 0x5F, KBDEXT | VK_SLEEP }, // Tecla SuspensiÃ³n + { 0x65, KBDEXT | VK_BROWSER_SEARCH }, // Pagina de bÃºsqueda en el navegador de Internet + { 0x66, KBDEXT | VK_BROWSER_FAVORITES }, // Favoritos, tengo que esperar a que el tcp/ip + { 0x67, KBDEXT | VK_BROWSER_REFRESH }, // Refrescar el navegador de Internet + { 0x68, KBDEXT | VK_BROWSER_STOP }, // Stop en el navegador de Internet + { 0x69, KBDEXT | VK_BROWSER_FORWARD }, // Adelante en el navegador de Internet + { 0x6A, KBDEXT | VK_BROWSER_BACK }, // AtrÃ¡s en el navegador de Internet + { 0x6B, KBDEXT | VK_LAUNCH_APP1 }, // Tecla Mi PC + { 0x6C, KBDEXT | VK_LAUNCH_MAIL }, // Abrir programa de e-mail + { 0x6D, KBDEXT | VK_LAUNCH_MEDIA_SELECT }, // Abrir reproductor multimedia + { 0x1C, KBDEXT | VK_RETURN }, // La tecla de intro + { 0x46, KBDEXT | VK_CANCEL }, // Tecla escape { 0, 0 }, }; -ROSDATA VSC_VK extcode1_to_vk[] = { +ROSDATA VSC_VK extcode1_to_vk[] = +{ { 0, 0 }, }; -ROSDATA VK_TO_BIT modifier_keys[] = { +ROSDATA VK_TO_BIT modifier_keys[] = +{ { VK_SHIFT, KBDSHIFT }, { VK_CONTROL, KBDCTRL }, { VK_MENU, KBDALT }, { 0, 0 } }; -ROSDATA MODIFIERS modifier_bits = { +ROSDATA MODIFIERS modifier_bits = +{ modifier_keys, 6, - { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } -/* NONE, SHIFT, CTRL, CTRL+SHIFT, ALT */ -}; - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - /* Normal vs Shifted */ - /* The numbers */ - //Del 1 al 5 tienen tres estados - { '4', 0, {'4', '$'} }, - { '5', 0, {'5', '%'} }, - //El 6 tiene 3 estados - { '7', 0, {'7', '/'} }, - { '8', 0, {'8', '('} }, - { '9', 0, {'9', ')'} }, - { '0', 0, {'0', '='} }, - { VK_OEM_3, CAPLOK, {0x00F1, 0x00D1} }, // Ã±Ã + { + 0, /* NINGUNO */ + 1, /* MAYÃS */ + 2, /* CTRL */ + 2|1, /* CTRL+MAYÃS */ + SHFT_INVALID, + SHFT_INVALID, + 3 /* ALT */ + } +}; + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = +{ + /* Normal, MayÃºs */ + /* The numbers -- Del 1 al 6 tienen tres estados */ + { L'7', 0, {L'7', L'/'} }, + { L'8', 0, {L'8', L'('} }, + { L'9', 0, {L'9', L')'} }, + { L'0', 0, {L'0', L'='} }, + { VK_OEM_3, CAPLOK, {L'Ã±', L'Ã'} }, /* Ã±Ã */ /* Specials */ /* Ctrl-_ generates ES */ - { VK_OEM_6 ,0, {0x00a1, 0x00bf} }, // Â¡Â¿ - { VK_OEM_4 ,0, {0x0027, '?'} }, //'? - { VK_OEM_COMMA ,0, {',', ';'} }, - { VK_OEM_PERIOD ,0, {'.', ':'} }, - { VK_OEM_MINUS ,0, {'-', '_'} }, - { VK_OEM_102 ,0, {'<', '>'} }, + { VK_OEM_6, 0, {L'Â¡', L'Â¿'} }, /* Â¡Â¿ */ + { VK_OEM_4, 0, {0x27, L'?'} }, /* '? */ + { VK_OEM_COMMA, 0, {L',', L';'} }, + { VK_OEM_PERIOD, 0, {L'.', L':'} }, + { VK_OEM_MINUS, 0, {L'-', L'_'} }, + { VK_OEM_102, 0, {L'<', L'>'} }, /* Keys that do not have shift states */ - { VK_TAB, 0, {'\t', '\t'} }, - { VK_ADD, 0, {'+', '+'} }, - { VK_SUBTRACT, 0, {'-', '-'} }, - { VK_MULTIPLY, 0, {'*', '*'} }, - { VK_DIVIDE, 0, {'/', '/'} }, - { VK_ESCAPE, 0, {0x1b,0x1b} }, - { VK_SPACE, 0, {' ', ' '} }, + { VK_TAB, 0, {L'\t', L'\t'} }, + { VK_ADD, 0, {L'+', L'+'} }, + { VK_SUBTRACT, 0, {L'-', L'-'} }, + { VK_MULTIPLY, 0, {L'*', L'*'} }, + { VK_DIVIDE, 0, {L'/', L'/'} }, + { VK_ESCAPE, 0, {0x1b, 0x1b} }, + { VK_SPACE, 0, {L' ', L' '} }, { 0, 0 } }; -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* Normal, Shifted, Ctrl */ - +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = +{ + /* Normal, MayÃºs, Ctrl */ /* The alphabet */ - { 'A', CAPLOK, {'a', 'A', 0x01} }, - { 'B', CAPLOK, {'b', 'B', 0x02} }, - { 'C', CAPLOK, {'c', 'C', 0x03} }, - { 'D', CAPLOK, {'d', 'D', 0x04} }, - { 'F', CAPLOK, {'f', 'F', 0x06} }, - { 'G', CAPLOK, {'g', 'G', 0x07} }, - { 'H', CAPLOK, {'h', 'H', 0x08} }, - { 'I', CAPLOK, {'i', 'I', 0x09} }, - { 'J', CAPLOK, {'j', 'J', 0x0a} }, - { 'K', CAPLOK, {'k', 'K', 0x0b} }, - { 'L', CAPLOK, {'l', 'L', 0x0c} }, - { 'M', CAPLOK, {'m', 'M', 0x0d} }, - { 'N', CAPLOK, {'n', 'N', 0x0e} }, - { 'O', CAPLOK, {'o', 'O', 0x0f} }, - { 'P', CAPLOK, {'p', 'P', 0x10} }, - { 'Q', CAPLOK, {'q', 'Q', 0x11} }, - { 'R', CAPLOK, {'r', 'R', 0x12} }, - { 'S', CAPLOK, {'s', 'S', 0x13} }, - { 'T', CAPLOK, {'t', 'T', 0x14} }, - { 'U', CAPLOK, {'u', 'U', 0x15} }, - { 'V', CAPLOK, {'v', 'V', 0x16} }, - { 'W', CAPLOK, {'w', 'W', 0x17} }, - { 'X', CAPLOK, {'x', 'X', 0x18} }, - { 'Y', CAPLOK, {'y', 'Y', 0x19} }, - { 'Z', CAPLOK, {'z', 'Z', 0x1a} }, + { L'A', CAPLOK, {L'a', L'A', 0x01} }, + { L'B', CAPLOK, {L'b', L'B', 0x02} }, + { L'C', CAPLOK, {L'c', L'C', 0x03} }, + { L'D', CAPLOK, {L'd', L'D', 0x04} }, + { L'F', CAPLOK, {L'f', L'F', 0x06} }, + { L'G', CAPLOK, {L'g', L'G', 0x07} }, + { L'H', CAPLOK, {L'h', L'H', 0x08} }, + { L'I', CAPLOK, {L'i', L'I', 0x09} }, + { L'J', CAPLOK, {L'j', L'J', 0x0a} }, + { L'K', CAPLOK, {L'k', L'K', 0x0b} }, + { L'L', CAPLOK, {L'l', L'L', 0x0c} }, + { L'M', CAPLOK, {L'm', L'M', 0x0d} }, + { L'N', CAPLOK, {L'n', L'N', 0x0e} }, + { L'O', CAPLOK, {L'o', L'O', 0x0f} }, + { L'P', CAPLOK, {L'p', L'P', 0x10} }, + { L'Q', CAPLOK, {L'q', L'Q', 0x11} }, + { L'R', CAPLOK, {L'r', L'R', 0x12} }, + { L'S', CAPLOK, {L's', L'S', 0x13} }, + { L'T', CAPLOK, {L't', L'T', 0x14} }, + { L'U', CAPLOK, {L'u', L'U', 0x15} }, + { L'V', CAPLOK, {L'v', L'V', 0x16} }, + { L'W', CAPLOK, {L'w', L'W', 0x17} }, + { L'X', CAPLOK, {L'x', L'X', 0x18} }, + { L'Y', CAPLOK, {L'y', L'Y', 0x19} }, + { L'Z', CAPLOK, {L'z', L'Z', 0x1a} }, /* Legacy (telnet-style) ascii escapes */ - { VK_RETURN, 0, {'\r', '\r', '\n'} }, - { 0,0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { -/* Normal, shifted, control, Alt+Gr */ - { '1', 0, {'1', '!', WCH_NONE, 0x00a6} }, // 1!| - { '2', 0, {'2', '"', WCH_NONE, '@'} }, // 2"@ - { '3', 0, {'3', 0x00B7, WCH_NONE, '#'} }, // 3Â·# - { L'4', 0, {L'4', L'$', WCH_NONE, WCH_DEAD} }, // 4$~ - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, L'~'} }, // 4$~ - { L'5', 0, {L'5', L'%', WCH_NONE, L'â¬'} }, // 5%â¬ - { '6', 0, {'6', '&', WCH_NONE, 0x00AC} }, // 6&Â¬ - { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC} }, // eEâ¬ - { VK_OEM_PLUS, 0, {'+', '*', WCH_NONE, 0x005d} }, // +*] - { VK_OEM_2, 0, {0x00e7, 0x00c7, WCH_NONE, '}'} }, // Ã§Ã} - - { VK_OEM_7, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, '{'} }, // Â´Â¨{ - { VK_EMPTY, 0, {0xB4, 0xA8, WCH_NONE, WCH_NONE} }, // Â´Â¨{ - - { VK_OEM_1, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, 0x5B} }, // `^[ - { VK_EMPTY, 0, {0x60, 0x5e, WCH_NONE, WCH_NONE} }, // `^[ - - { VK_OEM_5, 0, {0x00BA, 0x00AA, WCH_NONE, 0x005c} }, // Ã§Ã} + { VK_RETURN, 0, {L'\r',L'\r',L'\n'} }, { 0, 0 } }; -ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_NUMPAD0, 0, {'0'} }, - { VK_NUMPAD1, 0, {'1'} }, - { VK_NUMPAD2, 0, {'2'} }, - { VK_NUMPAD3, 0, {'3'} }, - { VK_NUMPAD4, 0, {'4'} }, - { VK_NUMPAD5, 0, {'5'} }, - { VK_NUMPAD6, 0, {'6'} }, - { VK_NUMPAD7, 0, {'7'} }, - { VK_NUMPAD8, 0, {'8'} }, - { VK_NUMPAD9, 0, {'9'} }, - { VK_DECIMAL, 0, {'.'} }, - { VK_BACK, 0, {'\010'} }, - { 0,0 } +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = +{ + /* Normal, MayÃºs, Ctrl, Alt+Gr */ + { L'1', 0, {L'1', L'!', WCH_NONE, L'|'} }, /* 1!| */ + { L'2', 0, {L'2', L'"', WCH_NONE, L'@'} }, /* 2"@ */ + { L'3', 0, {L'3', L'Â·', WCH_NONE, L'#'} }, /* 3Â·# */ + { L'4', 0, {L'4', L'$', WCH_NONE, WCH_DEAD} }, /* 4$~ */ + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, L'~'} }, /* 4$~ */ + { L'5', 0, {L'5', L'%', WCH_NONE, L'â¬'} }, /* 5%â¬ */ + { L'6', 0, {L'6', L'&', WCH_NONE, L'Â¬'} }, /* 6&Â¬ */ + { L'E', CAPLOK, {L'e', L'E', 0x05, L'â¬'} }, /* eEâ¬ */ + { VK_OEM_PLUS, 0, {L'+', L'*', WCH_NONE, L']'} }, /* +*] */ + { VK_OEM_2, 0, {L'Ã§', L'Ã', WCH_NONE, L'}'} }, /* Ã§Ã} */ + + { VK_OEM_7, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, L'{'} }, /* Â´Â¨{ */ + { VK_EMPTY, 0, {L'Â´', L'Â¨', WCH_NONE, WCH_NONE} }, /* Â´Â¨{ */ + + { VK_OEM_1, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, L'['} }, /* `^[ */ + { VK_EMPTY, 0, {L'`', L'^', WCH_NONE, WCH_NONE} }, /* `^[ */ + + { VK_OEM_5, 0, {L'Âº', L'Âª', WCH_NONE, 0x5c} }, /* ÂºÂª\ */ + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = +{ + { VK_NUMPAD0, 0, {L'0'} }, + { VK_NUMPAD1, 0, {L'1'} }, + { VK_NUMPAD2, 0, {L'2'} }, + { VK_NUMPAD3, 0, {L'3'} }, + { VK_NUMPAD4, 0, {L'4'} }, + { VK_NUMPAD5, 0, {L'5'} }, + { VK_NUMPAD6, 0, {L'6'} }, + { VK_NUMPAD7, 0, {L'7'} }, + { VK_NUMPAD8, 0, {L'8'} }, + { VK_NUMPAD9, 0, {L'9'} }, + { VK_DECIMAL, 0, {L'.'} }, + { VK_BACK, 0, {L'\010'} }, + { 0, 0 } }; #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } -ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(1,keypad_numbers), - vk_master(2,key_to_chars_2mod), - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - { 0,0,0 } +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = +{ + vk_master(1, keypad_numbers), + vk_master(2, key_to_chars_2mod), + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + { 0, 0, 0 } }; #define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags //no funciona -ROSDATA DEADKEY deadkey[] = -{ - //*Â´* - { DEADTRANS(L'a', 0xb4, 0xE1, 0x00) }, // letra a con Â´ - { DEADTRANS(L'A', 0xb4, 0xC1, 0x00) }, // letra A con Â´ - { DEADTRANS(L'e', 0xb4, 0xE9, 0x00) }, // letra e con Â´ - { DEADTRANS(L'E', 0xb4, 0xC9, 0x00) }, // letra E con Â´ - { DEADTRANS(L'i', 0xb4, 0xED, 0x00) }, // letra i con Â´ - { DEADTRANS(L'I', 0xb4, 0xCD, 0x00) }, // letra I con Â´ - { DEADTRANS(L'o', 0xb4, 0xF3, 0x00) }, // letra o con Â´ - { DEADTRANS(L'O', 0xb4, 0xD3, 0x00) }, // letra O con Â´ - { DEADTRANS(L'u', 0xb4, 0xFA, 0x00) }, // letra u con Â´ - { DEADTRANS(L'U', 0xb4, 0xDA, 0x00) }, // letra U con Â´ - //*`* - { DEADTRANS(L'a', 0x60, 0xE0, 0x00) }, // letra a con ` - { DEADTRANS(L'A', 0x60, 0xC0, 0x00) }, // letra A con ` - { DEADTRANS(L'e', 0x60, 0xE8, 0x00) }, // letra e con ` - { DEADTRANS(L'E', 0x60, 0xC8, 0x00) }, // letra E con ` - { DEADTRANS(L'i', 0x60, 0xEC, 0x00) }, // letra i con ` - { DEADTRANS(L'I', 0x60, 0xCC, 0x00) }, // letra I con ` - { DEADTRANS(L'o', 0x60, 0xF2, 0x00) }, // letra o con ` - { DEADTRANS(L'O', 0x60, 0xD2, 0x00) }, // letra O con ` - { DEADTRANS(L'u', 0x60, 0xF9, 0x00) }, // letra u con ` - { DEADTRANS(L'U', 0x60, 0xD9, 0x00) }, // letra U con ` - //*^* - { DEADTRANS(L'a', 0x5E, 0xE2, 0x00) }, // letra a con ^ - { DEADTRANS(L'A', 0x5E, 0xC2, 0x00) }, // letra A con ^ - { DEADTRANS(L'e', 0x5E, 0xEA, 0x00) }, // letra e con ^ - { DEADTRANS(L'E', 0x5E, 0xCA, 0x00) }, // letra E con ^ - { DEADTRANS(L'i', 0x5E, 0xEE, 0x00) }, // letra i con ^ - { DEADTRANS(L'I', 0x5E, 0xCE, 0x00) }, // letra I con ^ - { DEADTRANS(L'o', 0x5E, 0xF4, 0x00) }, // letra o con ^ - { DEADTRANS(L'O', 0x5E, 0xD4, 0x00) }, // letra O con ^ - { DEADTRANS(L'u', 0x5E, 0xFB, 0x00) }, // letra u con ^ - { DEADTRANS(L'U', 0x5E, 0xDB, 0x00) }, // letra U con ^ - //*Â¨* - { DEADTRANS(L'a', 0xA8, 0xE4, 0x00) }, // letra a con Â¨ - { DEADTRANS(L'A', 0xA8, 0xC4, 0x00) }, // letra A con Â¨ - { DEADTRANS(L'e', 0xA8, 0xEB, 0x00) }, // letra e con Â¨ - { DEADTRANS(L'E', 0xA8, 0xCB, 0x00) }, // letra E con Â¨ - { DEADTRANS(L'i', 0xA8, 0xEF, 0x00) }, // letra i con Â¨ - { DEADTRANS(L'I', 0xA8, 0xCF, 0x00) }, // letra I con Â¨ - { DEADTRANS(L'o', 0xA8, 0xF6, 0x00) }, // letra o con Â¨ - { DEADTRANS(L'O', 0xA8, 0xD6, 0x00) }, // letra O con Â¨ - { DEADTRANS(L'u', 0xA8, 0xFC, 0x00) }, // letra u con Â¨ - { DEADTRANS(L'U', 0xA8, 0xDC, 0x00) }, // letra U con Â¨ - //*~* - { DEADTRANS(L'a', 0x7e, 0xe3, 0x00) }, // Ã£ - { DEADTRANS(L'A', 0x7e, 0xc3, 0x00) }, // Ã - { DEADTRANS(L'n', 0x7e, 0xf1, 0x00) }, // Ã± - { DEADTRANS(L'N', 0x7e, 0xd1, 0x00) }, // Ã - { DEADTRANS(L'o', 0x7e, 0xf5, 0x00) }, // Ãµ - { DEADTRANS(L'O', 0x7e, 0xd5, 0x00) }, // Ã - { 0, 0, 0} -}; - -ROSDATA VSC_LPWSTR key_names[] = { +ROSDATA DEADKEY deadkey[] = +{ + /* Â´ */ + { DEADTRANS(L'a', L'Â´', 0xE1, 0x00) }, // letra a con Â´ | Ã¡ + { DEADTRANS(L'A', L'Â´', 0xC1, 0x00) }, // letra A con Â´ | Ã + { DEADTRANS(L'e', L'Â´', 0xE9, 0x00) }, // letra e con Â´ | Ã© + { DEADTRANS(L'E', L'Â´', 0xC9, 0x00) }, // letra E con Â´ | Ã + { DEADTRANS(L'i', L'Â´', 0xED, 0x00) }, // letra i con Â´ | Ã + { DEADTRANS(L'I', L'Â´', 0xCD, 0x00) }, // letra I con Â´ | Ã + { DEADTRANS(L'o', L'Â´', 0xF3, 0x00) }, // letra o con Â´ | Ã³ + { DEADTRANS(L'O', L'Â´', 0xD3, 0x00) }, // letra O con Â´ | Ã + { DEADTRANS(L'u', L'Â´', 0xFA, 0x00) }, // letra u con Â´ | Ãº + { DEADTRANS(L'U', L'Â´', 0xDA, 0x00) }, // letra U con Â´ | Ã + + /* ` */ + { DEADTRANS(L'a', L'`', 0xE0, 0x00) }, // letra a con ` | Ã + { DEADTRANS(L'A', L'`', 0xC0, 0x00) }, // letra A con ` | Ã + { DEADTRANS(L'e', L'`', 0xE8, 0x00) }, // letra e con ` | Ã¨ + { DEADTRANS(L'E', L'`', 0xC8, 0x00) }, // letra E con ` | Ã + { DEADTRANS(L'i', L'`', 0xEC, 0x00) }, // letra i con ` | Ã¬ + { DEADTRANS(L'I', L'`', 0xCC, 0x00) }, // letra I con ` | Ã + { DEADTRANS(L'o', L'`', 0xF2, 0x00) }, // letra o con ` | Ã² + { DEADTRANS(L'O', L'`', 0xD2, 0x00) }, // letra O con ` | Ã + { DEADTRANS(L'u', L'`', 0xF9, 0x00) }, // letra u con ` | Ã¹ + { DEADTRANS(L'U', L'`', 0xD9, 0x00) }, // letra U con ` | Ã + + /* ^ */ + { DEADTRANS(L'a', L'^', 0xE2, 0x00) }, // letra a con ^ | Ã¢ + { DEADTRANS(L'A', L'^', 0xC2, 0x00) }, // letra A con ^ | Ã + { DEADTRANS(L'e', L'^', 0xEA, 0x00) }, // letra e con ^ | Ãª + { DEADTRANS(L'E', L'^', 0xCA, 0x00) }, // letra E con ^ | Ã + { DEADTRANS(L'i', L'^', 0xEE, 0x00) }, // letra i con ^ | Ã® + { DEADTRANS(L'I', L'^', 0xCE, 0x00) }, // letra I con ^ | Ã + { DEADTRANS(L'o', L'^', 0xF4, 0x00) }, // letra o con ^ | Ã´ + { DEADTRANS(L'O', L'^', 0xD4, 0x00) }, // letra O con ^ | Ã + { DEADTRANS(L'u', L'^', 0xFB, 0x00) }, // letra u con ^ | Ã» + { DEADTRANS(L'U', L'^', 0xDB, 0x00) }, // letra U con ^ | Ã + + /* Â¨ */ + { DEADTRANS(L'a', L'Â¨', 0xE4, 0x00) }, // letra a con Â¨ | Ã¤ + { DEADTRANS(L'A', L'Â¨', 0xC4, 0x00) }, // letra A con Â¨ | Ã + { DEADTRANS(L'e', L'Â¨', 0xEB, 0x00) }, // letra e con Â¨ | Ã« + { DEADTRANS(L'E', L'Â¨', 0xCB, 0x00) }, // letra E con Â¨ | Ã + { DEADTRANS(L'i', L'Â¨', 0xEF, 0x00) }, // letra i con Â¨ | Ã¯ + { DEADTRANS(L'I', L'Â¨', 0xCF, 0x00) }, // letra I con Â¨ | Ã + { DEADTRANS(L'o', L'Â¨', 0xF6, 0x00) }, // letra o con Â¨ | Ã¶ + { DEADTRANS(L'O', L'Â¨', 0xD6, 0x00) }, // letra O con Â¨ | Ã + { DEADTRANS(L'u', L'Â¨', 0xFC, 0x00) }, // letra u con Â¨ | Ã¼ + { DEADTRANS(L'U', L'Â¨', 0xDC, 0x00) }, // letra U con Â¨ | Ã + + /* ~ */ + { DEADTRANS(L'a', L'~', 0xe3, 0x00) }, // letra a con ~ | Ã£ + { DEADTRANS(L'A', L'~', 0xc3, 0x00) }, // letra A con ~ | Ã + { DEADTRANS(L'n', L'~', 0xf1, 0x00) }, // letra n con ~ | Ã± + { DEADTRANS(L'N', L'~', 0xd1, 0x00) }, // letra N con ~ | Ã + { DEADTRANS(L'o', L'~', 0xf5, 0x00) }, // letra o con ~ | Ãµ + { DEADTRANS(L'O', L'~', 0xd5, 0x00) }, // letra O con ~ | Ã + + { 0, 0, 0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = +{ { 0x00, L"" }, { 0x01, L"Esc" }, { 0x0e, L"Retroceso" }, @@ -457,7 +477,8 @@ { 0, NULL }, }; -ROSDATA VSC_LPWSTR extended_key_names[] = { +ROSDATA VSC_LPWSTR extended_key_names[] = +{ { 0x1c, L"Intro num" }, { 0x1d, L"Ctrl der." }, { 0x35, L"/ num." }, @@ -483,32 +504,33 @@ { 0, NULL }, }; -ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00b4" L"Agudo", - L"\x0060" L"Grave", - L"\x005e" L"Circunflejo", - L"\x00A8" L"DiÃ©resis", - NULL +ROSDATA DEADKEY_LPWSTR dead_key_names[] = +{ + L"\x00b4" L"Agudo", + L"\x0060" L"Grave", + L"\x005e" L"Circunflejo", + L"\x00A8" L"DiÃ©resis", + NULL }; /* Finally, the master table */ -ROSDATA KBDTABLES keyboard_layout_table = { - +ROSDATA KBDTABLES keyboard_layout_table = +{ /* modifier assignments */ &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table, - /* diacritical marks -- currently implemented by wine code */ - /* Spanish have severals */ + /* diacritical marks -- currently implemented by wine code, spanish has several */ deadkey, /* Key names */ (VSC_LPWSTR *)key_names, (VSC_LPWSTR *)extended_key_names, + + /* Dead key names */ dead_key_names, - /* Dead key names */ /* scan code to virtual key maps */ scancode_to_vk, @@ -516,14 +538,16 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(KLLF_ALTGR, 1), /* Version 1.0 */ - - /* Ligatures -- Spanish doesn't have any */ + /* version 1.0 */ + MAKELONG(KLLF_ALTGR, 1), + + /* ligatures -- Spanish does not have any */ 0, 0, NULL }; -PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { +PKBDTABLES WINAPI KbdLayerDescriptor(VOID) +{ return &keyboard_layout_table; }

1 0

[akhaldi] 65552: [PSDK] * Add missing MoveFileWithProgress{A, W} declarations. CORE-4476
by akhaldi＠svn.reactos.org 03 Dec '14

03 Dec '14

Author: akhaldi Date: Wed Dec 3 11:35:29 2014 New Revision: 65552 URL: http://svn.reactos.org/svn/reactos?rev=65552&view=rev Log: [PSDK] * Add missing MoveFileWithProgress{A,W} declarations. CORE-4476 Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed Dec 3 11:35:29 2014 @@ -2724,6 +2724,8 @@ BOOL WINAPI MoveFileW(_In_ LPCWSTR, _In_ LPCWSTR); BOOL WINAPI MoveFileExA(_In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD); BOOL WINAPI MoveFileExW(_In_ LPCWSTR, _In_opt_ LPCWSTR, _In_ DWORD); +BOOL WINAPI MoveFileWithProgressA(_In_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPPROGRESS_ROUTINE, _In_opt_ LPVOID, _In_ DWORD); +BOOL WINAPI MoveFileWithProgressW(_In_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPPROGRESS_ROUTINE, _In_opt_ LPVOID, _In_ DWORD); int WINAPI MulDiv(_In_ int, _In_ int, _In_ int); BOOL WINAPI NotifyChangeEventLog(_In_ HANDLE, _In_ HANDLE); BOOL WINAPI ObjectCloseAuditAlarmA(_In_ LPCSTR, _In_ PVOID, _In_ BOOL); @@ -3378,6 +3380,7 @@ #define lstrlen lstrlenW #define MoveFile MoveFileW #define MoveFileEx MoveFileExW +#define MoveFileWithProgress MoveFileWithProgressW #define ObjectCloseAuditAlarm ObjectCloseAuditAlarmW #define ObjectDeleteAuditAlarm ObjectDeleteAuditAlarmW #define ObjectOpenAuditAlarm ObjectOpenAuditAlarmW @@ -3585,6 +3588,7 @@ #define lstrlen lstrlenA #define MoveFile MoveFileA #define MoveFileEx MoveFileExA +#define MoveFileWithProgress MoveFileWithProgressA #define ObjectCloseAuditAlarm ObjectCloseAuditAlarmA #define ObjectDeleteAuditAlarm ObjectDeleteAuditAlarmA #define ObjectOpenAuditAlarm ObjectOpenAuditAlarmA

1 0

[jgardou] 65551: [KMTEST/TCPIP] - Adjust test data to better reflect w2k3 behaviour. Thanks Amine for the tests.
by jgardou＠svn.reactos.org 02 Dec '14

02 Dec '14

Author: jgardou Date: Tue Dec 2 18:53:45 2014 New Revision: 65551 URL: http://svn.reactos.org/svn/reactos?rev=65551&view=rev Log: [KMTEST/TCPIP] - Adjust test data to better reflect w2k3 behaviour. Thanks Amine for the tests. Modified: trunk/rostests/kmtests/tcpip/tdi.c Modified: trunk/rostests/kmtests/tcpip/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tdi.c?rev=6… ============================================================================== --- trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] Tue Dec 2 18:53:45 2014 @@ -39,35 +39,8 @@ RTL_CONSTANT_STRING(L"\\Device\\Tcp"), STATUS_SUCCESS, STATUS_SUCCESS, { - 0x0002, // Version - 0x3FFFFFFF, // MaxSendSize - 0, // MaxConnectionUserData - 65515, // MaxDatagramSize - TDI_SERVICE_CONNECTION_MODE | - TDI_SERVICE_ORDERLY_RELEASE | - TDI_SERVICE_CONNECTIONLESS_MODE | - TDI_SERVICE_ERROR_FREE_DELIVERY | - TDI_SERVICE_BROADCAST_SUPPORTED | - TDI_SERVICE_DELAYED_ACCEPTANCE | - TDI_SERVICE_EXPEDITED_DATA | - TDI_SERVICE_NO_ZERO_LENGTH | - TDI_SERVICE_DGRAM_CONNECTION | - TDI_SERVICE_FORCE_ACCESS_CHECK | - TDI_SERVICE_DIRECT_ACCEPT | - TDI_SERVICE_ADDRESS_SECURITY | - TDI_SERVICE_NO_PUSH, // ServiceFlags - 1, // MinimumLookaheadData - 65535, // MaximumLookaheadData - 0, // NumberOfResources - {{0}} // StartTime - } - }, - { - RTL_CONSTANT_STRING(L"\\Device\\Udp"), - STATUS_SUCCESS, STATUS_SUCCESS, - { - 0x0002, // Version - 0x3FFFFFFF, // MaxSendSize + 0x0100, // Version + 0xFFFFFFFF, // MaxSendSize 0, // MaxConnectionUserData 65507, // MaxDatagramSize TDI_SERVICE_CONNECTION_MODE | @@ -80,8 +53,11 @@ TDI_SERVICE_NO_ZERO_LENGTH | TDI_SERVICE_DGRAM_CONNECTION | TDI_SERVICE_FORCE_ACCESS_CHECK | - TDI_SERVICE_DIRECT_ACCEPT | - TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + TDI_SERVICE_SEND_AND_DISCONNECT | + TDI_SERVICE_ACCEPT_LOCAL_ADDR | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_PREPOST_RECVS | + TDI_SERVICE_NO_PUSH, // ServiceFlags 1, // MinimumLookaheadData 65535, // MaximumLookaheadData 0, // NumberOfResources @@ -89,17 +65,13 @@ } }, { - RTL_CONSTANT_STRING(L"\\Device\\Ip"), - STATUS_SUCCESS, STATUS_NOT_IMPLEMENTED, - }, - { - RTL_CONSTANT_STRING(L"\\Device\\RawIp"), + RTL_CONSTANT_STRING(L"\\Device\\Udp"), STATUS_SUCCESS, STATUS_SUCCESS, { - 0x0002, // Version - 0x3FFFFFFF, // MaxSendSize + 0x0100, // Version + 0xFFFFFFFF, // MaxSendSize 0, // MaxConnectionUserData - 65515, // MaxDatagramSize + 65507, // MaxDatagramSize TDI_SERVICE_CONNECTION_MODE | TDI_SERVICE_ORDERLY_RELEASE | TDI_SERVICE_CONNECTIONLESS_MODE | @@ -110,8 +82,11 @@ TDI_SERVICE_NO_ZERO_LENGTH | TDI_SERVICE_DGRAM_CONNECTION | TDI_SERVICE_FORCE_ACCESS_CHECK | - TDI_SERVICE_DIRECT_ACCEPT | - TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + TDI_SERVICE_SEND_AND_DISCONNECT | + TDI_SERVICE_ACCEPT_LOCAL_ADDR | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_PREPOST_RECVS | + TDI_SERVICE_NO_PUSH, // ServiceFlags 1, // MinimumLookaheadData 65535, // MaximumLookaheadData 0, // NumberOfResources @@ -119,8 +94,41 @@ } }, { + RTL_CONSTANT_STRING(L"\\Device\\Ip"), + STATUS_SUCCESS, STATUS_NOT_IMPLEMENTED, + }, + { + RTL_CONSTANT_STRING(L"\\Device\\RawIp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0100, // Version + 0xFFFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65507, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_SEND_AND_DISCONNECT | + TDI_SERVICE_ACCEPT_LOCAL_ADDR | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_PREPOST_RECVS | + TDI_SERVICE_NO_PUSH, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { RTL_CONSTANT_STRING(L"\\Device\\IPMULTICAST"), - STATUS_OBJECT_NAME_NOT_FOUND, + STATUS_SUCCESS, STATUS_INVALID_PARAMETER, }, }; ULONG i;

1 0

[jgardou] 65550: [KMTESTS/TCPIP] - Fix MSVC build.
by jgardou＠svn.reactos.org 02 Dec '14

02 Dec '14

Author: jgardou Date: Tue Dec 2 18:38:32 2014 New Revision: 65550 URL: http://svn.reactos.org/svn/reactos?rev=65550&view=rev Log: [KMTESTS/TCPIP] - Fix MSVC build. Modified: trunk/rostests/kmtests/tcpip/tdi.c Modified: trunk/rostests/kmtests/tcpip/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tdi.c?rev=6… ============================================================================== --- trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] Tue Dec 2 18:38:32 2014 @@ -9,8 +9,8 @@ #include <tdikrnl.h> static +NTSTATUS NTAPI -NTSTATUS IrpCompletionRoutine( _In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp,

1 0

[jgardou] 65549: [TCPIP_DRVTEST] - Do not try to HeapFree a stack buffer.
by jgardou＠svn.reactos.org 02 Dec '14

02 Dec '14

Author: jgardou Date: Tue Dec 2 18:12:26 2014 New Revision: 65549 URL: http://svn.reactos.org/svn/reactos?rev=65549&view=rev Log: [TCPIP_DRVTEST] - Do not try to HeapFree a stack buffer. Modified: trunk/rostests/drivers/tcpip/InterfaceInfo.c Modified: trunk/rostests/drivers/tcpip/InterfaceInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/InterfaceIn… ============================================================================== --- trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] Tue Dec 2 18:12:26 2014 @@ -102,6 +102,7 @@ trace("\tIndex %lu, name %S\n", pInterfaceInfo->Adapter[i].Index, pInterfaceInfo->Adapter[i].Name); } - HeapFree(GetProcessHeap(), 0, pInterfaceInfo); + if (pInterfaceInfo != &InterfaceInfo) + HeapFree(GetProcessHeap(), 0, pInterfaceInfo); CloseHandle(FileHandle); }

1 0

[jgardou] 65548: [KMTESTS] - Fix typo
by jgardou＠svn.reactos.org 02 Dec '14

02 Dec '14

Author: jgardou Date: Tue Dec 2 18:08:33 2014 New Revision: 65548 URL: http://svn.reactos.org/svn/reactos?rev=65548&view=rev Log: [KMTESTS] - Fix typo Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:08:33 2014 @@ -132,7 +132,7 @@ example_drv iodeviceobject_drv iohelper_drv - tcpip_test_drv) + tcpip_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest)

1 0

[jgardou] 65547: [ROSTESTS] - Add tcpip_drvtest, for now only testing the IOCTL behind iphlpapi's GetInterfaceInfo
by jgardou＠svn.reactos.org 02 Dec '14

02 Dec '14

Author: jgardou Date: Tue Dec 2 18:06:57 2014 New Revision: 65547 URL: http://svn.reactos.org/svn/reactos?rev=65547&view=rev Log: [ROSTESTS] - Add tcpip_drvtest, for now only testing the IOCTL behind iphlpapi's GetInterfaceInfo Added: trunk/rostests/drivers/CMakeLists.txt (with props) trunk/rostests/drivers/tcpip/ trunk/rostests/drivers/tcpip/CMakeLists.txt (with props) trunk/rostests/drivers/tcpip/InterfaceInfo.c (with props) trunk/rostests/drivers/tcpip/testlist.c (with props) Modified: trunk/rostests/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=65547&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -1,7 +1,7 @@ add_subdirectory(apitests) #add_subdirectory(dibtests) -#add_subdirectory(drivers) +add_subdirectory(drivers) #add_subdirectory(dxtest) add_subdirectory(kmtests) #add_subdirectory(regtests) Added: trunk/rostests/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/drivers/CMakeLists.txt (added) +++ trunk/rostests/drivers/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,5 @@ + +#add_subdirectory(csqtest) +#add_subdirectory(memtest) +#add_subdirectory(ntoskrnl) +add_subdirectory(tcpip) Propchange: trunk/rostests/drivers/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/drivers/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/CMakeLists.… ============================================================================== --- trunk/rostests/drivers/tcpip/CMakeLists.txt (added) +++ trunk/rostests/drivers/tcpip/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,12 @@ + +include_directories(../../apitests/include) + +list(APPEND SOURCE + InterfaceInfo.c + testlist.c) + +add_executable(tcpip_drvtest ${SOURCE}) +target_link_libraries(tcpip_drvtest wine) +set_module_type(tcpip_drvtest win32cui) +add_importlibs(tcpip_drvtest msvcrt kernel32 ntdll) +add_cd_file(TARGET tcpip_drvtest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/drivers/tcpip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/drivers/tcpip/InterfaceInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/InterfaceIn… ============================================================================== --- trunk/rostests/drivers/tcpip/InterfaceInfo.c (added) +++ trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,107 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: User mode part of the TcpIp.sys test suite + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <apitest.h> + +#include <ipexport.h> +#include <winioctl.h> +#include <tcpioctl.h> +#include <tcpip_undoc.h> + +START_TEST(InterfaceInfo) +{ + IP_INTERFACE_INFO* pInterfaceInfo; + IP_INTERFACE_INFO InterfaceInfo; + HANDLE FileHandle; + DWORD BufferSize; + BOOL Result; + ULONG i; + + /* Open a control channel file for TCP */ + FileHandle = CreateFileW( + L"\\\\.\\Tcp", + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + ok(FileHandle != INVALID_HANDLE_VALUE, "CreateFile failed, GLE %lu\n", GetLastError()); + + /* Try the IOCTL */ + BufferSize = 0; + pInterfaceInfo = &InterfaceInfo; + Result = DeviceIoControl( + FileHandle, + IOCTL_IP_INTERFACE_INFO, + NULL, + 0, + pInterfaceInfo, + sizeof(InterfaceInfo), + &BufferSize, + NULL); + ok(!Result, "DeviceIoControl succeeded.\n"); + ok_long(GetLastError(), ERROR_INVALID_FUNCTION); + ok_long(BufferSize, 0); + + CloseHandle(FileHandle); + + /* This IOCTL only works with \Device\Ip */ + FileHandle = CreateFileW( + L"\\\\.\\Ip", + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + ok(FileHandle != INVALID_HANDLE_VALUE, "CreateFile failed, GLE %lu\n", GetLastError()); + + /* Get the buffer size. */ + BufferSize = 0; + pInterfaceInfo = &InterfaceInfo; + Result = DeviceIoControl( + FileHandle, + IOCTL_IP_INTERFACE_INFO, + NULL, + 0, + pInterfaceInfo, + sizeof(InterfaceInfo), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + ok(BufferSize != 0, "Buffer size is zero.\n"); + trace("Buffer size is %lu.\n", BufferSize); + + if (BufferSize > sizeof(InterfaceInfo)) + { + pInterfaceInfo = HeapAlloc(GetProcessHeap(), 0, BufferSize); + ok(pInterfaceInfo != NULL, "HeapAlloc failed.\n"); + + /* Send IOCTL to fill the buffer in. */ + Result = DeviceIoControl( + FileHandle, + IOCTL_IP_INTERFACE_INFO, + NULL, + 0, + pInterfaceInfo, + BufferSize, + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + } + + /* Nothing much to test. Just print out the adapters we got */ + trace("We got %ld adapters.\n", pInterfaceInfo->NumAdapters); + for (i = 0; i < pInterfaceInfo->NumAdapters; i++) + { + trace("\tIndex %lu, name %S\n", pInterfaceInfo->Adapter[i].Index, pInterfaceInfo->Adapter[i].Name); + } + + HeapFree(GetProcessHeap(), 0, pInterfaceInfo); + CloseHandle(FileHandle); +} Propchange: trunk/rostests/drivers/tcpip/InterfaceInfo.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/drivers/tcpip/InterfaceInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/drivers/tcpip/InterfaceInfo.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/drivers/tcpip/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/testlist.c?… ============================================================================== --- trunk/rostests/drivers/tcpip/testlist.c (added) +++ trunk/rostests/drivers/tcpip/testlist.c [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,14 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_InterfaceInfo(void); + +const struct test winetest_testlist[] = +{ + { "InterfaceInfo", func_InterfaceInfo }, + + { 0, 0 } +}; + Propchange: trunk/rostests/drivers/tcpip/testlist.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/drivers/tcpip/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/drivers/tcpip/testlist.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[jgardou] 65546: [KMTEST] - Add some tests for tcpip.sys TDI capabilities (for now, TDI_PROVIDER_INFO)
by jgardou＠svn.reactos.org 02 Dec '14

02 Dec '14

Author: jgardou Date: Tue Dec 2 18:06:48 2014 New Revision: 65546 URL: http://svn.reactos.org/svn/reactos?rev=65546&view=rev Log: [KMTEST] - Add some tests for tcpip.sys TDI capabilities (for now, TDI_PROVIDER_INFO) Added: trunk/rostests/kmtests/tcpip/ trunk/rostests/kmtests/tcpip/CMakeLists.txt (with props) trunk/rostests/kmtests/tcpip/TcpIp_drv.c (with props) trunk/rostests/kmtests/tcpip/TcpIp_user.c (with props) trunk/rostests/kmtests/tcpip/tcpip.h (with props) trunk/rostests/kmtests/tcpip/tdi.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -7,6 +7,7 @@ add_subdirectory(example) add_subdirectory(kernel32) add_subdirectory(ntos_io) +add_subdirectory(tcpip) list(APPEND COMMON_SOURCE example/GuardedMemory.c @@ -108,6 +109,7 @@ example/Example_user.c kernel32/FindFile_user.c ntos_io/IoDeviceObject_user.c + tcpip/TcpIp_user.c ${COMMON_SOURCE} kmtest/kmtest.rc) @@ -129,7 +131,8 @@ kmtest_drv example_drv iodeviceobject_drv - iohelper_drv) + iohelper_drv + tcpip_test_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest) Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -17,6 +17,8 @@ KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; KMT_TESTFUNC Test_RtlUnicodeString; +KMT_TESTFUNC Test_TcpIpIoctl; +KMT_TESTFUNC Test_TcpIpTdi; /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = @@ -31,5 +33,6 @@ { "RtlRegistry", Test_RtlRegistry }, { "RtlSplayTree", Test_RtlSplayTree }, { "RtlUnicodeString", Test_RtlUnicodeString }, + { "TcpIpTdi", Test_TcpIpTdi }, { NULL, NULL }, }; Added: trunk/rostests/kmtests/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/CMakeLists.… ============================================================================== --- trunk/rostests/kmtests/tcpip/CMakeLists.txt (added) +++ trunk/rostests/kmtests/tcpip/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,15 @@ + +include_directories(../include) + +list(APPEND TCPIP_TEST_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + tdi.c + TcpIp_drv.c) + +add_library(tcpip_drv SHARED ${TCPIP_TEST_DRV_SOURCE}) +set_module_type(tcpip_drv kernelmodedriver) +target_link_libraries(tcpip_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(tcpip_drv ntoskrnl hal) +add_target_compile_definitions(tcpip_drv KMT_STANDALONE_DRIVER) +#add_pch(example_drv ../include/kmt_test.h) +add_cd_file(TARGET tcpip_drv DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/kmtests/tcpip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/tcpip/TcpIp_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_drv.c… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_drv.c (added) +++ trunk/rostests/kmtests/tcpip/TcpIp_drv.c [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite for tcpip.sys + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> +#include "tcpip.h" + +extern KMT_MESSAGE_HANDLER TestTdi; + +static struct +{ + ULONG ControlCode; + PKMT_MESSAGE_HANDLER Handler; +} MessageHandlers[] = +{ + { IOCTL_TEST_TDI, TestTdi }, +}; + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + ULONG i; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(DriverObject); + UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); + + *DeviceName = L"TcpIp"; + + for (i = 0; i < (sizeof(MessageHandlers) / sizeof(MessageHandlers[0])); i++) + KmtRegisterMessageHandler(MessageHandlers[i].ControlCode, NULL, MessageHandlers[i].Handler); + + trace("TcpIp test driver loaded.\n"); + + return STATUS_SUCCESS; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + UNREFERENCED_PARAMETER(DriverObject); +} + Propchange: trunk/rostests/kmtests/tcpip/TcpIp_drv.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/TcpIp_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/TcpIp_drv.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/kmtests/tcpip/TcpIp_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_user.… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_user.c (added) +++ trunk/rostests/kmtests/tcpip/TcpIp_user.c [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: User mode part of the TcpIp.sys test suite + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> + +#include "tcpip.h" + +static +void +LoadTcpIpTestDriver(void) +{ + /* Start the special-purpose driver */ + KmtLoadDriver(L"TcpIp", FALSE); + KmtOpenDriver(); +} + +static +void +UnloadTcpIpTestDriver(void) +{ + /* Stop the driver. */ + KmtCloseDriver(); + KmtUnloadDriver(); +} + +START_TEST(TcpIpTdi) +{ + LoadTcpIpTestDriver(); + + ok(KmtSendToDriver(IOCTL_TEST_TDI) == ERROR_SUCCESS, "\n"); + + UnloadTcpIpTestDriver(); +} Propchange: trunk/rostests/kmtests/tcpip/TcpIp_user.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/TcpIp_user.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/TcpIp_user.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/kmtests/tcpip/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tcpip.h?rev… ============================================================================== --- trunk/rostests/kmtests/tcpip/tcpip.h (added) +++ trunk/rostests/kmtests/tcpip/tcpip.h [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,2 @@ + +#define IOCTL_TEST_TDI 1 Propchange: trunk/rostests/kmtests/tcpip/tcpip.h ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/tcpip.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/tcpip.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/kmtests/tcpip/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tdi.c?rev=6… ============================================================================== --- trunk/rostests/kmtests/tcpip/tdi.c (added) +++ trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,291 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite for TCPIP.sys + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> +#include <tdikrnl.h> + +static +NTAPI +NTSTATUS +IrpCompletionRoutine( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + + KeSetEvent((PKEVENT)Context, IO_NETWORK_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static +VOID +TestProviderInfo(void) +{ + struct + { + UNICODE_STRING DeviceName; + NTSTATUS CreateStatus, IrpStatus; + TDI_PROVIDER_INFO ExpectedInfo; + } TestData[] = + { + { + RTL_CONSTANT_STRING(L"\\Device\\Tcp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0002, // Version + 0x3FFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65515, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_DIRECT_ACCEPT | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_NO_PUSH, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { + RTL_CONSTANT_STRING(L"\\Device\\Udp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0002, // Version + 0x3FFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65507, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_DIRECT_ACCEPT | + TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { + RTL_CONSTANT_STRING(L"\\Device\\Ip"), + STATUS_SUCCESS, STATUS_NOT_IMPLEMENTED, + }, + { + RTL_CONSTANT_STRING(L"\\Device\\RawIp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0002, // Version + 0x3FFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65515, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_DIRECT_ACCEPT | + TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { + RTL_CONSTANT_STRING(L"\\Device\\IPMULTICAST"), + STATUS_OBJECT_NAME_NOT_FOUND, + }, + }; + ULONG i; + + for (i = 0; i < (sizeof(TestData) / sizeof(TestData[0])); i++) + { + IO_STATUS_BLOCK StatusBlock; + NTSTATUS Status; + FILE_OBJECT* FileObject; + DEVICE_OBJECT* DeviceObject; + PIRP Irp; + KEVENT Event; + PMDL Mdl; + TDI_PROVIDER_INFO* ProviderInfo; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + + trace("Testing device %wZ\n", &TestData[i].DeviceName); + + InitializeObjectAttributes( + &ObjectAttributes, + &TestData[i].DeviceName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwCreateFile( + &FileHandle, + FILE_READ_DATA | FILE_WRITE_DATA, + &ObjectAttributes, + &StatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + ok_eq_hex(Status, TestData[i].CreateStatus); + if (!NT_SUCCESS(Status)) + continue; + + Status = ObReferenceObjectByHandle( + FileHandle, + GENERIC_READ, + *IoFileObjectType, + KernelMode, + (PVOID*)&FileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + return; + + DeviceObject = IoGetRelatedDeviceObject(FileObject); + ok(DeviceObject != NULL, "Device object is NULL!\n"); + if (!DeviceObject) + { + ObDereferenceObject(FileObject); + return; + } + + ProviderInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ProviderInfo), 'tseT'); + ok(ProviderInfo != NULL, "Ran out of memory.\n"); + if (!ProviderInfo) + { + ObDereferenceObject(FileObject); + return; + } + + Mdl = IoAllocateMdl(ProviderInfo, sizeof(*ProviderInfo), FALSE, FALSE, NULL); + ok(Mdl != NULL, "Could not allocate the MDL!\n"); + if (!Mdl) + { + ExFreePoolWithTag(ProviderInfo, 'tseT'); + ObDereferenceObject(FileObject); + return; + } + + MmBuildMdlForNonPagedPool(Mdl); + + /* Build the IRP */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + ok(Irp != NULL, "TdiBuildInternalDeviceControlIrp returned NULL!\n"); + if (!Irp) + { + IoFreeMdl(Mdl); + ExFreePoolWithTag(ProviderInfo, 'tseT'); + ObDereferenceObject(FileObject); + return; + } + + TdiBuildQueryInformation( + Irp, + DeviceObject, + FileObject, + NULL, + NULL, + TDI_QUERY_PROVIDER_INFO, + Mdl); + + IoSetCompletionRoutine(Irp, IrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject( + &Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = StatusBlock.Status; + } + ok_eq_hex(Status, TestData[i].IrpStatus); + + IoFreeIrp(Irp); + IoFreeMdl(Mdl); + ObDereferenceObject(FileObject); + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ProviderInfo, 'tseT'); + continue; + } + + ok_eq_hex(ProviderInfo->Version, TestData[i].ExpectedInfo.Version); + ok_eq_ulong(ProviderInfo->MaxSendSize, TestData[i].ExpectedInfo.MaxSendSize); + ok_eq_ulong(ProviderInfo->MaxConnectionUserData, TestData[i].ExpectedInfo.MaxConnectionUserData); + ok_eq_ulong(ProviderInfo->MaxDatagramSize, TestData[i].ExpectedInfo.MaxDatagramSize); + ok_eq_hex(ProviderInfo->ServiceFlags, TestData[i].ExpectedInfo.ServiceFlags); + ok_eq_ulong(ProviderInfo->MinimumLookaheadData, TestData[i].ExpectedInfo.MinimumLookaheadData); + ok_eq_ulong(ProviderInfo->MaximumLookaheadData, TestData[i].ExpectedInfo.MaximumLookaheadData); + ok_eq_ulong(ProviderInfo->NumberOfResources, TestData[i].ExpectedInfo.NumberOfResources); + + ExFreePoolWithTag(ProviderInfo, 'tseT'); + } +} + +static KSTART_ROUTINE RunTest; +static +VOID +NTAPI +RunTest( + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(Context); + + TestProviderInfo(); +} + +KMT_MESSAGE_HANDLER TestTdi; +NTSTATUS +TestTdi( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_opt_ PVOID Buffer, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength +) +{ + PKTHREAD Thread; + + Thread = KmtStartThread(RunTest, NULL); + KmtFinishThread(Thread, NULL); + + return STATUS_SUCCESS; +} Propchange: trunk/rostests/kmtests/tcpip/tdi.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/tdi.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/tdi.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs