Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 59468: [BROWSEUI] - Export CCommonBrowser, CRegTreeOptions, CGlobalFolderSettings - Fix IBrowserService3 method signatures in CCommonBrowser - Add IContextMenu3 to CBandSiteMenu
by tfaber＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: tfaber Date: Sat Jul 13 09:23:33 2013 New Revision: 59468 URL: http://svn.reactos.org/svn/reactos?rev=59468&view=rev Log: [BROWSEUI] - Export CCommonBrowser, CRegTreeOptions, CGlobalFolderSettings - Fix IBrowserService3 method signatures in CCommonBrowser - Add IContextMenu3 to CBandSiteMenu Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.cpp trunk/reactos/dll/win32/browseui/bandsitemenu.h trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/browseui/commonbrowser.cpp trunk/reactos/dll/win32/browseui/commonbrowser.h trunk/reactos/dll/win32/browseui/globalfoldersettings.h trunk/reactos/dll/win32/browseui/regtreeoptions.h Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsitemenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsitemenu.cpp [iso-8859-1] Sat Jul 13 09:23:33 2013 @@ -59,6 +59,12 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) { - FIXME("(%p, %p)\n", this, uMsg, wParam, lParam); + FIXME("(%p, %u, %p, %p)\n", this, uMsg, wParam, lParam); return E_NOTIMPL; } + +HRESULT STDMETHODCALLTYPE CBandSiteMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) +{ + FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam); + return E_NOTIMPL; +} Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] Sat Jul 13 09:23:33 2013 @@ -25,7 +25,7 @@ class CBandSiteMenu : public CComCoClass<CBandSiteMenu, &CLSID_BandSiteMenu>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu2, + public IContextMenu3, public IShellService { public: @@ -43,6 +43,9 @@ // *** IContextMenu2 methods *** virtual HRESULT STDMETHODCALLTYPE HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); + // *** IContextMenu3 methods *** + virtual HRESULT STDMETHODCALLTYPE HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); + DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITEMENU) DECLARE_NOT_AGGREGATABLE(CBandSiteMenu) 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] Sat Jul 13 09:23:33 2013 @@ -36,7 +36,10 @@ OBJECT_ENTRY(CLSID_RebarBandSite, CBandSite) OBJECT_ENTRY(CLSID_BandSiteMenu, CBandSiteMenu) OBJECT_ENTRY(CLSID_BrandBand, CBrandBand) +OBJECT_ENTRY(CLSID_CCommonBrowser, CCommonBrowser) +OBJECT_ENTRY(CLSID_GlobalFolderSettings, CGlobalFolderSettings) OBJECT_ENTRY(CLSID_InternetToolbar, CInternetToolbar) +OBJECT_ENTRY(CLSID_CRegTreeOptions, CRegTreeOptions) END_OBJECT_MAP() CBrowseUIModule gModule; Modified: trunk/reactos/dll/win32/browseui/commonbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb… ============================================================================== --- trunk/reactos/dll/win32/browseui/commonbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/commonbrowser.cpp [iso-8859-1] Sat Jul 13 09:23:33 2013 @@ -509,13 +509,13 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::_PositionViewWindow(HWND *, RECT *) +HRESULT STDMETHODCALLTYPE CCommonBrowser::_PositionViewWindow(HWND, RECT *) { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayNameEx( - unsigned int, const unsigned short *, DWORD, LPITEMIDLIST *) + UINT, PCWSTR, DWORD, LPITEMIDLIST *) { return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/browseui/commonbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb… ============================================================================== --- trunk/reactos/dll/win32/browseui/commonbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/commonbrowser.h [iso-8859-1] Sat Jul 13 09:23:33 2013 @@ -21,7 +21,7 @@ #pragma once class CCommonBrowser : - public CComCoClass<CCommonBrowser, &CLSID_ACLMulti>, + public CComCoClass<CCommonBrowser, &CLSID_CCommonBrowser>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellBrowser, public IBrowserService3, @@ -142,8 +142,8 @@ virtual HRESULT STDMETHODCALLTYPE v_CheckZoneCrossing(LPCITEMIDLIST pidl); // *** IBrowserService3 methods *** - virtual HRESULT STDMETHODCALLTYPE _PositionViewWindow(HWND *, RECT *); - virtual HRESULT STDMETHODCALLTYPE IEParseDisplayNameEx(unsigned int, const unsigned short *, DWORD, LPITEMIDLIST *); + virtual HRESULT STDMETHODCALLTYPE _PositionViewWindow(HWND, RECT *); + virtual HRESULT STDMETHODCALLTYPE IEParseDisplayNameEx(UINT, PCWSTR, DWORD, LPITEMIDLIST *); // *** IShellBrowser methods *** virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths); @@ -187,6 +187,7 @@ virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); DECLARE_REGISTRY_RESOURCEID(IDR_COMMONBROWSER) + DECLARE_NOT_AGGREGATABLE(CCommonBrowser) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/win32/browseui/globalfoldersettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/globalf… ============================================================================== --- trunk/reactos/dll/win32/browseui/globalfoldersettings.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/globalfoldersettings.h [iso-8859-1] Sat Jul 13 09:23:33 2013 @@ -21,7 +21,7 @@ #pragma once class CGlobalFolderSettings : - public CComCoClass<CGlobalFolderSettings, &CLSID_ACLMulti>, + public CComCoClass<CGlobalFolderSettings, &CLSID_GlobalFolderSettings>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IGlobalFolderSettings { Modified: trunk/reactos/dll/win32/browseui/regtreeoptions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regtree… ============================================================================== --- trunk/reactos/dll/win32/browseui/regtreeoptions.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/regtreeoptions.h [iso-8859-1] Sat Jul 13 09:23:33 2013 @@ -21,7 +21,7 @@ #pragma once class CRegTreeOptions : - public CComCoClass<CRegTreeOptions, &CLSID_ACLMulti>, + public CComCoClass<CRegTreeOptions, &CLSID_CRegTreeOptions>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IRegTreeOptions, public IObjectWithSite

1 0

[tfaber] 59467: [BROWSEUI] - Fix the order of some COM interfaces. This should have no functional effect, but makes testing easier.
by tfaber＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: tfaber Date: Sat Jul 13 09:06:18 2013 New Revision: 59467 URL: http://svn.reactos.org/svn/reactos?rev=59467&view=rev Log: [BROWSEUI] - Fix the order of some COM interfaces. This should have no functional effect, but makes testing easier. Modified: trunk/reactos/dll/win32/browseui/aclmulti.h trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/addresseditbox.h trunk/reactos/dll/win32/browseui/bandsite.h trunk/reactos/dll/win32/browseui/bandsitemenu.h trunk/reactos/dll/win32/browseui/brandband.h trunk/reactos/dll/win32/browseui/commonbrowser.h Modified: trunk/reactos/dll/win32/browseui/aclmulti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/aclmult… ============================================================================== --- trunk/reactos/dll/win32/browseui/aclmulti.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/aclmulti.h [iso-8859-1] Sat Jul 13 09:06:18 2013 @@ -25,8 +25,8 @@ public CComCoClass<CACLMulti, &CLSID_ACLMulti>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IEnumString, - public IACList, - public IObjMgr + public IObjMgr, + public IACList { private: struct ACLMultiSublist Modified: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Sat Jul 13 09:06:18 2013 @@ -25,14 +25,14 @@ public CComCoClass<CAddressBand, &CLSID_SH_AddressBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IDeskBand, - public IOleCommandTarget, public IObjectWithSite, public IInputObject, + public IPersistStream, + public IOleCommandTarget, + public IServiceProvider, public IWinEventHandler, public IAddressBand, - public IServiceProvider, - public IInputObjectSite, - public IPersistStream + public IInputObjectSite { private: CComPtr<IDockingWindowSite> fSite; Modified: trunk/reactos/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] Sat Jul 13 09:06:18 2013 @@ -24,13 +24,13 @@ public CWindowImpl<CAddressEditBox, CWindow, CControlWinTraits>, public CComCoClass<CAddressEditBox, &CLSID_AddressEditBox>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellService, + public IWinEventHandler, + public IDispatch, public IAddressBand, public IAddressEditBox, - public IWinEventHandler, public IOleCommandTarget, - public IDispatch, - public IPersistStream + public IPersistStream, + public IShellService { private: CContainedWindow fEditWindow; Modified: trunk/reactos/dll/win32/browseui/bandsite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.h [iso-8859-1] Sat Jul 13 09:06:18 2013 @@ -24,15 +24,15 @@ class CBandSiteBase : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IBandSite, + public IInputObjectSite, + public IInputObject, + public IDeskBarClient, public IWinEventHandler, - public IDeskBarClient, - public IOleCommandTarget, - public IInputObject, - public IInputObjectSite, - public IServiceProvider, public IPersistStream, public IDropTarget, - public IBandSiteHelper + public IServiceProvider, + public IBandSiteHelper, + public IOleCommandTarget { private: struct BandObject Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] Sat Jul 13 09:06:18 2013 @@ -25,8 +25,8 @@ class CBandSiteMenu : public CComCoClass<CBandSiteMenu, &CLSID_BandSiteMenu>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellService, - public IContextMenu2 + public IContextMenu2, + public IShellService { public: CBandSiteMenu(); Modified: trunk/reactos/dll/win32/browseui/brandband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.h [iso-8859-1] Sat Jul 13 09:06:18 2013 @@ -28,9 +28,9 @@ public IObjectWithSite, public IInputObject, public IPersistStream, - public IWinEventHandler, public IOleCommandTarget, public IServiceProvider, + public IWinEventHandler, public IDispatch { private: Modified: trunk/reactos/dll/win32/browseui/commonbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb… ============================================================================== --- trunk/reactos/dll/win32/browseui/commonbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/commonbrowser.h [iso-8859-1] Sat Jul 13 09:06:18 2013 @@ -23,15 +23,15 @@ class CCommonBrowser : public CComCoClass<CCommonBrowser, &CLSID_ACLMulti>, public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellBrowser, + public IBrowserService3, public IServiceProvider, public IOleCommandTarget, - public IBrowserService3, - public IShellBrowser, - public IShellBrowserService, public IDockingWindowSite, public IDockingWindowFrame, public IInputObjectSite, - public IDropTarget + public IDropTarget, + public IShellBrowserService { private: public:

1 0

[tfaber] 59466: [COM_APITEST] - Add additional classes and interfaces
by tfaber＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: tfaber Date: Sat Jul 13 08:07:42 2013 New Revision: 59466 URL: http://svn.reactos.org/svn/reactos?rev=59466&view=rev Log: [COM_APITEST] - Add additional classes and interfaces Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shdocvw.c trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sat Jul 13 08:07:42 2013 @@ -13,9 +13,156 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { { + ID_NAME(CLSID_ACLMulti), + { + { 0x0, &IID_IEnumString }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjMgr }, + { 0x8, &IID_IACList }, + } + }, + { + ID_NAME(CLSID_AddressEditBox), + { + { 0x0, &IID_IWinEventHandler }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IDispatch }, + { 0x8, &IID_IAddressBand }, + { 0xc, &IID_IAddressEditBox }, + { 0x10, &IID_IOleCommandTarget }, + { 0x14, &IID_IPersistStream }, + { 0x18, &IID_IShellService }, + } + }, + { + ID_NAME(CLSID_BandProxy), + { + { 0x0, &IID_IBandProxy }, + { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_BrandBand), + { + { 0x0, &IID_IDeskBand }, + { 0x0, &IID_IDockingWindow }, + { 0x0, &IID_IOleWindow }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0xc, &IID_IInputObject }, + { 0x10, &IID_IPersistStream }, + { 0x10, &IID_IPersist }, + { 0x14, &IID_IOleCommandTarget }, + { 0x18, &IID_IServiceProvider }, + { 0x30, &IID_IWinEventHandler }, + { 0x34, &IID_IDispatch }, + } + }, + { + ID_NAME(CLSID_BandSiteMenu), + { + { 0x0, &IID_IContextMenu3 }, + { 0x0, &IID_IContextMenu2 }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellService }, + } + }, + { + ID_NAME(CLSID_CCommonBrowser), + { + { 0x0, &IID_IUnknown }, + { 0xc, &IID_IShellBrowser }, + { 0xc, &IID_IOleWindow }, + { 0x10, &IID_IBrowserService3 }, + { 0x10, &IID_IBrowserService2 }, + { 0x10, &IID_IBrowserService }, + { 0x14, &IID_IServiceProvider }, + { 0x18, &IID_IOleCommandTarget }, + { 0x1c, &IID_IDockingWindowSite }, + { 0x20, &IID_IDockingWindowFrame }, + { 0x24, &IID_IInputObjectSite }, + { 0x28, &IID_IDropTarget }, + { 0x2c, &IID_IShellBrowserService }, + } + }, + { + ID_NAME(CLSID_CRegTreeOptions), + { + { 0x0, &IID_IRegTreeOptions }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_DeskBar), + { + { -0xb8, &IID_IOleCommandTarget }, + { -0xb4, &IID_IServiceProvider }, + { -0xb0, &IID_IDeskBar }, + { -0xb0, &IID_IOleWindow }, + { -0xac, &IID_IInputObjectSite }, + { -0xa8, &IID_IInputObject }, + { -0x70, &IID_IDockingWindow }, + { -0x6c, &IID_IObjectWithSite }, + { -0x68, &IID_IPersistStreamInit }, + { -0x68, &IID_IPersistStream }, + { -0x68, &IID_IPersist }, + { -0x64, &IID_IPersistPropertyBag }, + { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_DeskBarApp), + { + { -0xb8, &IID_IOleCommandTarget }, + { -0xb4, &IID_IServiceProvider }, + { -0xb0, &IID_IDeskBar }, + { -0xb0, &IID_IOleWindow }, + { -0xac, &IID_IInputObjectSite }, + { -0xa8, &IID_IInputObject }, + { -0x70, &IID_IDockingWindow }, + { -0x6c, &IID_IObjectWithSite }, + { -0x68, &IID_IPersistStreamInit }, + { -0x68, &IID_IPersistStream }, + { -0x68, &IID_IPersist }, + { -0x64, &IID_IPersistPropertyBag }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IContextMenu3 }, + { 0x8, &IID_IContextMenu2 }, + { 0x8, &IID_IContextMenu }, + } + }, + { + ID_NAME(CLSID_GlobalFolderSettings), + { + { 0x0, &IID_IGlobalFolderSettings }, + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_InternetToolbar), + { + { -0x54, &IID_IOleCommandTarget }, + { -0x50, &IID_IServiceProvider }, + { -0x4c, &IID_IDeskBar }, + { -0x4c, &IID_IOleWindow }, + { -0x48, &IID_IInputObjectSite }, + { -0x44, &IID_IInputObject }, + { -0xc, &IID_IDockingWindow }, + { -0x8, &IID_IObjectWithSite }, + { -0x4, &IID_IExplorerToolbar }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistStreamInit }, + { 0x8, &IID_IShellChangeNotify }, + } + }, + { ID_NAME(CLSID_RebarBandSite), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IUnknown }, { 0xc, &IID_IBandSite }, { 0x10, &IID_IInputObjectSite }, { 0x14, &IID_IInputObject }, Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sat Jul 13 08:07:42 2013 @@ -31,33 +31,52 @@ { ID_NAME(IID_IACList), ID_NAME(IID_IACList2), + ID_NAME(IID_IADesktopP2), ID_NAME(IID_IAccessible), + ID_NAME(IID_IAccessControl), + ID_NAME(IID_IAccessor), + ID_NAME(IID_IActiveDesktop), + ID_NAME(IID_IActiveDesktopP), + ID_NAME(IID_IAddressBarParser), ID_NAME(IID_IAddressBand), ID_NAME(IID_IAddressEditBox), + ID_NAME(IID_IAutoComplete), + ID_NAME(IID_IAutoComplete2), ID_NAME(IID_IBandNavigate), ID_NAME(IID_IBandProxy), ID_NAME(IID_IBandSite), ID_NAME(IID_IBandSiteHelper), ID_NAME(IID_IBanneredBar), ID_NAME(IID_IBindCtx), + ID_NAME(IID_IBrowserFrameOptions), ID_NAME(IID_IBrowserService), ID_NAME(IID_IBrowserService2), + ID_NAME(IID_IBrowserService3), ID_NAME(IID_IClassFactory), ID_NAME(IID_IClassFactory2), ID_NAME(IID_IClassFactory3), ID_NAME(IID_IClientSecurity), ID_NAME(IID_IComThreadingInfo), + ID_NAME(IID_IContext), ID_NAME(IID_IContextMenu), ID_NAME(IID_IContextMenu2), ID_NAME(IID_IContextMenu3), ID_NAME(IID_IContextMenuCB), ID_NAME(IID_IContextMenuSite), ID_NAME(IID_IContinue), + ID_NAME(IID_IDVGetEnum), ID_NAME(IID_IDataObject), + ID_NAME(IID_IDefViewID), ID_NAME(IID_IDefViewFrame), + ID_NAME(IID_IDefViewFrame3), + ID_NAME(IID_IDefViewFrameGroup), + ID_NAME(IID_IDefViewSafety), + ID_NAME(IID_IDefViewScript), ID_NAME(IID_IDeskBand), + ID_NAME(IID_IDeskBandEx), ID_NAME(IID_IDeskBar), ID_NAME(IID_IDeskBarClient), + ID_NAME(IID_IDeskMovr), ID_NAME(IID_IDispatch), ID_NAME(IID_IDockingWindow), ID_NAME(IID_IDockingWindowFrame), @@ -73,6 +92,7 @@ ID_NAME(IID_IEnumShellItems), ID_NAME(IID_IEnumString), ID_NAME(IID_IEnumUnknown), + ID_NAME(IID_IEnumVARIANT), ID_NAME(IID_IErrorLog), ID_NAME(IID_IExplorerToolbar), ID_NAME(IID_IExtractIconA), @@ -83,6 +103,8 @@ ID_NAME(IID_IFileDialog2), ID_NAME(IID_IFileSearchBand), ID_NAME(IID_IFolderBandPriv), + ID_NAME(IID_IFolderFilter), + ID_NAME(IID_IFolderFilterSite), ID_NAME(IID_IFolderView), ID_NAME(IID_IFolderView2), ID_NAME(IID_IFolderViewOC), @@ -96,6 +118,7 @@ ID_NAME(IID_IMenuBand), ID_NAME(IID_IMenuPopup), ID_NAME(IID_IMoniker), + ID_NAME(IID_IMultiMonitorDockingSite), ID_NAME(IID_IMultiQI), ID_NAME(IID_INamespaceProxy), ID_NAME(IID_INameSpaceTreeControl), @@ -146,6 +169,8 @@ ID_NAME(IID_IShellDispatch3), ID_NAME(IID_IShellDispatch4), ID_NAME(IID_IShellDispatch5), + ID_NAME(IID_IShellExtInit), + ID_NAME(IID_IShellPropSheetExt), ID_NAME(IID_IShellIconOverlayIdentifier), ID_NAME(IID_IShellFolder), ID_NAME(IID_IShellFolder2), @@ -167,6 +192,7 @@ ID_NAME(IID_IShellMenu2), ID_NAME(IID_IShellMenuAcc), ID_NAME(IID_IShellMenuCallback), + ID_NAME(IID_IShellNameSpace), ID_NAME(IID_IShellService), ID_NAME(IID_IShellView), ID_NAME(IID_IShellView2), @@ -186,11 +212,13 @@ ID_NAME(IID_IUnknown), ID_NAME(IID_IViewObject), ID_NAME(IID_IViewObject2), + ID_NAME(IID_IViewObjectEx), ID_NAME(IID_IWinEventHandler), ID_NAME(IID_DFConstraint), ID_NAME(DIID_DShellFolderViewEvents), + ID_NAME(IID_CDefView), ID_NAME(IID_Folder), ID_NAME(IID_Folder2), ID_NAME(IID_Folder3), @@ -201,6 +229,8 @@ ID_NAME(IID_FolderItems3), ID_NAME(IID_FolderItemVerb), ID_NAME(IID_FolderItemVerbs), + + ID_NAME(CLSID_ShellDesktop) }; static const INT KnownInterfaceCount = RTL_NUMBER_OF(KnownInterfaces); Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sat Jul 13 08:07:42 2013 @@ -65,6 +65,7 @@ #define FARAWY (-65535) // TODO: fix our headers... we really shouldn't need these here +DEFINE_GUID(CLSID_ActiveDesktop, 0x75048700, 0xef1f, 0x11d0, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); DEFINE_GUID(CLSID_DeskMovr, 0x72267F6A, 0xA6F9, 0x11D0, 0xBC, 0x94, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91); @@ -83,14 +84,33 @@ DEFINE_GUID(CLSID_StartMenuPin, 0xa2a9545d, 0xa0c2, 0x42b4, 0x97, 0x08, 0xa0, 0xb2, 0xba, 0xdd, 0x77, 0xc8); DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); +DEFINE_GUID(IID_IADesktopP2, 0xb22754e2, 0x4574, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); +DEFINE_GUID(IID_IAccessControl, 0xeedd23e0, 0x8410, 0x11ce, 0xa1, 0xc3, 0x08, 0x00, 0x2b, 0x2b, 0x8d, 0x8f); +DEFINE_GUID(IID_IAccessor, 0x0c733a8c, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); +DEFINE_GUID(IID_IActiveDesktopP, 0x52502ee0, 0xec80, 0x11d0, 0x89, 0xab, 0x00, 0xc0, 0x4f, 0xc2, 0x97, 0x2d); +DEFINE_GUID(IID_IAddressBarParser, 0xc9d81948, 0x443a, 0x40c7, 0x94, 0x5c, 0x5e, 0x17, 0x1b, 0x8c, 0x66, 0xb4); +DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b, 0x34, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); +DEFINE_GUID(IID_IContext, 0x000001c0, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +DEFINE_GUID(IID_IDVGetEnum, 0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73, 0x43, 0xcb, 0x0a, 0x34, 0x8c); +DEFINE_GUID(IID_IDefViewID, 0x985f64f0, 0xd410, 0x4e02, 0xbe, 0x22, 0xda, 0x07, 0xf2, 0xb5, 0xc5, 0xe1); DEFINE_GUID(IID_IDefViewFrame, 0x710EB7A0, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); +DEFINE_GUID(IID_IDefViewFrame3, 0x985f64f0, 0xd410, 0x4e02, 0xbe, 0x22, 0xda, 0x07, 0xf2, 0xb5, 0xc5, 0xe1); +DEFINE_GUID(IID_IDefViewFrameGroup, 0xb4bf6da0, 0xbfba, 0x4cbf, 0xb0, 0x3a, 0x6c, 0x55, 0xfa, 0x20, 0xaf, 0x65); +DEFINE_GUID(IID_IDefViewSafety, 0x9a93b3fb, 0x4e75, 0x4c74, 0x87, 0x1a, 0x2c, 0xda, 0x66, 0x7f, 0x39, 0xa5); +DEFINE_GUID(IID_IDefViewScript, 0x4706b500, 0x09ef, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); +DEFINE_GUID(IID_IDeskBandEx, 0x5dd6b79a, 0x3ab7, 0x49c0, 0xab, 0x82, 0x6b, 0x2d, 0xa7, 0xd7, 0x8d, 0x75); +DEFINE_GUID(IID_IDeskMovr, 0x72267f69, 0xa6f9, 0x11d0, 0xbc, 0x94, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63); DEFINE_GUID(IID_IDocViewSite, 0x87D605E0, 0xC511, 0x11CF, 0x89, 0xA9, 0x00, 0xA0, 0xC9, 0x05, 0x41, 0x29); DEFINE_GUID(IID_IExtractImage, 0xbb2e617c, 0x0920, 0x11d1, 0x9a, 0x0b, 0x00, 0xc0, 0x4f, 0xc2, 0xd6, 0xc1); DEFINE_GUID(IID_IExtractImage2, 0x953bb1ee, 0x93b4, 0x11d1, 0x98, 0xa3, 0x00, 0xc0, 0x4f, 0xb6, 0x87, 0xda); DEFINE_GUID(IID_IFileSearchBand, 0x2d91eea1, 0x9932, 0x11d2, 0xbe, 0x86, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); DEFINE_GUID(IID_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea); +DEFINE_GUID(IID_IFolderFilter, 0x9cc22886, 0xdc8e, 0x11d2, 0xb1, 0xd0, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); +DEFINE_GUID(IID_IFolderFilterSite, 0xc0a651f5, 0xb48b, 0x11d2, 0xb5, 0xed, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); +DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); @@ -102,8 +122,10 @@ DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); +DEFINE_GUID(IID_IViewObjectEx, 0x3af24292, 0x0c96, 0x11ce, 0xa0, 0xcf, 0x00, 0xaa, 0x00, 0x60, 0x0a, 0xb8); DEFINE_GUID(IID_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9f, 0x00, 0xa0, 0xc9, 0x1e, 0xed, 0xba); +DEFINE_GUID(IID_CDefView, 0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x65, 0x08, 0x00, 0x2b, 0xe2, 0x12, 0x62); DEFINE_GUID(IID_FolderItems2, 0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f); DEFINE_GUID(IID_FolderItems3, 0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f); Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sat Jul 13 08:07:42 2013 @@ -12,6 +12,26 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { + { + ID_NAME(CLSID_ExplorerBand), + { + { -0xb4, &IID_IDeskBand }, + { -0xb4, &IID_IDockingWindow }, + { -0xb4, &IID_IOleWindow }, + { -0xb0, &IID_IObjectWithSite }, + { -0xa8, &IID_IInputObject }, + { -0xa4, &IID_IPersistStream }, + { -0xa4, &IID_IPersist }, + { -0xa0, &IID_IOleCommandTarget }, + { -0x9c, &IID_IServiceProvider }, + { -0x84, &IID_IContextMenu }, + { -0x80, &IID_IBandNavigate }, + { -0x7c, &IID_IWinEventHandler }, + { -0x78, &IID_INamespaceProxy }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + } + }, { ID_NAME(CLSID_FontsFolderShortcut), { @@ -30,6 +50,7 @@ { 0x20, &IID_IPersistStream }, { 0x20, &IID_IPersistStreamInit }, { 0x24, &IID_IPersistPropertyBag }, + { 0x28, &IID_IBrowserFrameOptions }, } }, #if 0 // E_OUTOFMEMORY? Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sat Jul 13 08:07:42 2013 @@ -19,18 +19,22 @@ { 0x0, &IID_IContextMenu2 }, { 0x0, &IID_IContextMenu }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellExtInit }, { 0x8, &IID_IObjectWithSite }, + { 0x10, &IID_IFolderFilter }, } }, { ID_NAME(CLSID_DeskMovr), { { 0x0, &IID_IUnknown }, + { 0x70, &IID_IDeskMovr }, { 0x74, &IID_IOleObject }, { 0x78, &IID_IPersistPropertyBag }, { 0x80, &IID_IOleInPlaceActiveObject }, - { 0x84, &IID_IViewObject2 }, - { 0x84, &IID_IViewObject }, + { 0x84, &IID_IViewObjectEx }, + { 0x84, &IID_IViewObject2 }, + { 0x84, &IID_IViewObject }, { 0x88, &IID_IOleWindow }, { 0x88, &IID_IOleInPlaceObject }, { 0x88, &IID_IOleInPlaceObjectWindowless }, @@ -110,6 +114,7 @@ { 0x20, &IID_IPersistStream }, { 0x20, &IID_IPersistStreamInit }, { 0x24, &IID_IPersistPropertyBag }, + { 0x28, &IID_IBrowserFrameOptions }, } }, { @@ -210,7 +215,9 @@ { 0x0, &IID_IContextMenu2 }, { 0x0, &IID_IContextMenu }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellExtInit }, { 0x8, &IID_IObjectWithSite }, + { 0x10, &IID_IFolderFilter }, } }, { @@ -220,7 +227,8 @@ { -0x4, &IID_IContextMenu3 }, { -0x4, &IID_IContextMenu2 }, { -0x4, &IID_IContextMenu }, - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IShellExtInit }, + { 0x0, &IID_IUnknown }, } }, { @@ -272,7 +280,8 @@ { -0x4, &IID_IContextMenu3 }, { -0x4, &IID_IContextMenu2 }, { -0x4, &IID_IContextMenu }, - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IShellExtInit }, + { 0x0, &IID_IUnknown }, { 0x4, &IID_IOleWindow }, } }, @@ -292,7 +301,8 @@ { ID_NAME(CLSID_ShellDesktop), { - { -0x8, &IID_IObjectWithSite }, + { -0x8, &CLSID_ShellDesktop }, + { -0x8, &IID_IObjectWithSite }, { 0x0, &IID_IUnknown }, { 0x8, &IID_IPersistFolder2 }, { 0x8, &IID_IPersistFolder }, @@ -322,7 +332,9 @@ { ID_NAME(CLSID_ShellFldSetExt), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IShellPropSheetExt }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellExtInit }, { 0x8, &IID_IObjectWithSite }, } }, @@ -371,6 +383,7 @@ { 0x4, &IID_IShellLinkW }, { 0x8, &IID_IPersistStream }, { 0xc, &IID_IPersistFile }, + { 0x10, &IID_IShellExtInit }, { 0x14, &IID_IContextMenu3 }, { 0x14, &IID_IContextMenu2 }, { 0x14, &IID_IContextMenu }, @@ -412,7 +425,8 @@ { ID_NAME(CLSID_StartMenuPin), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IShellExtInit }, + { 0x0, &IID_IUnknown }, { 0x4, &IID_IContextMenu }, { 0xc, &IID_IObjectWithSite }, }

1 0

[tfaber] 59465: [COM_APITEST] - Add support for classes with ThreadingModel values other than Apartment
by tfaber＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: tfaber Date: Sat Jul 13 08:01:51 2013 New Revision: 59465 URL: http://svn.reactos.org/svn/reactos?rev=59465&view=rev Log: [COM_APITEST] - Add support for classes with ThreadingModel values other than Apartment Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sat Jul 13 08:01:51 2013 @@ -346,8 +346,9 @@ NTSTATUS status; UNICODE_STRING clsid; DWORD type; - WCHAR dllName[100]; - DWORD dllNameSize; + WCHAR data[100]; + DWORD dataSize; + PCWSTR expectedThreadingModel; class = &ExpectedInterfaces[iClass]; status = RtlStringFromGUID(class->clsid, &clsid); @@ -367,31 +368,34 @@ if (myskip(result == NO_ERROR, "No key\n")) continue; - dllNameSize = sizeof(dllName); - result = RegQueryValueEx(hKeyServer, NULL, NULL, &type, (PBYTE)dllName, &dllNameSize); + dataSize = sizeof(data); + result = RegQueryValueEx(hKeyServer, NULL, NULL, &type, (PBYTE)data, &dataSize); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); if (!myskip(result == NO_ERROR, "No module name\n")) { ok(type == REG_SZ || type == REG_EXPAND_SZ, "type %lu for %s\n", type, class->name); - ok(dllNameSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dllNameSize, class->name); - ok(dllNameSize <= sizeof(dllName), "size %lu for %s\n", dllNameSize, class->name); - ok(dllName[dllNameSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); + ok(dataSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dataSize, class->name); + ok(dataSize <= sizeof(data), "size %lu for %s\n", dataSize, class->name); + ok(data[dataSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); // TODO: Use SearchPath (or assume everything's in system32) and do a proper full path compare - PathStripPathW(dllName); - PathRemoveExtensionW(dllName); - ok(!wcsicmp(dllName, ModuleName), "Server is %ls, expected %ls for %s\n", dllName, ModuleName, class->name); + PathStripPathW(data); + PathRemoveExtensionW(data); + ok(!wcsicmp(data, ModuleName), "Server is %ls, expected %ls for %s\n", data, ModuleName, class->name); } - dllNameSize = sizeof(dllName); - result = RegQueryValueEx(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)dllName, &dllNameSize); + dataSize = sizeof(data); + result = RegQueryValueEx(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)data, &dataSize); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); if (!myskip(result == NO_ERROR, "No ThreadingModel\n")) { ok(type == REG_SZ || type == REG_EXPAND_SZ, "type %lu for %s\n", type, class->name); - ok(dllNameSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dllNameSize, class->name); - ok(dllNameSize <= sizeof(dllName), "size %lu for %s\n", dllNameSize, class->name); - ok(dllName[dllNameSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); - ok(!wcsicmp(dllName, L"Apartment"), "Server is %ls, expected %ls for %s\n", dllName, L"Apartment", class->name); + ok(dataSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dataSize, class->name); + ok(dataSize <= sizeof(data), "size %lu for %s\n", dataSize, class->name); + ok(data[dataSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); + expectedThreadingModel = class->ThreadingModel; + if (!expectedThreadingModel) + expectedThreadingModel = L"Apartment"; + ok(!wcsicmp(data, expectedThreadingModel), "Server is %ls, expected %ls for %s\n", data, expectedThreadingModel, class->name); } RegCloseKey(hKeyServer); @@ -428,7 +432,7 @@ IClassFactory *pCF = pv; hr = IClassFactory_CreateInstance(pCF, NULL, &IID_IUnknown, &pv); ok(hr == S_OK, "IClassFactory::CreateInstance failed for %s, hr = 0x%lx\n", class->name, hr); - if (SUCCEEDED(hr)) + if (!myskip(SUCCEEDED(hr), "No instance\n")) { IUnknown *pUnk = pv; IUnknown_Release(pUnk); Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sat Jul 13 08:01:51 2013 @@ -48,6 +48,7 @@ LONG offset; const IID *iid; } ifaces[80]; + PCWSTR ThreadingModel; } CLASS_AND_INTERFACES; typedef const CLASS_AND_INTERFACES *PCCLASS_AND_INTERFACES;

1 0

[tfaber] 59464: [PSDK] - Add CLSID_CCommonBrowser, CLSID_DeskBar, CLSID_DeskBarApp
by tfaber＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: tfaber Date: Sat Jul 13 07:07:27 2013 New Revision: 59464 URL: http://svn.reactos.org/svn/reactos?rev=59464&view=rev Log: [PSDK] - Add CLSID_CCommonBrowser, CLSID_DeskBar, CLSID_DeskBarApp Modified: trunk/reactos/include/psdk/shlguid_undoc.h Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Sat Jul 13 07:07:27 2013 @@ -78,6 +78,9 @@ DEFINE_GUID(CLSID_ShellSearchExt, 0x169A0691, 0x8DF9, 0x11D1, 0xA1, 0xC4, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); DEFINE_GUID(CLSID_CommonButtons, 0x1E79697E, 0x9CC5, 0x11D1, 0xA8, 0x3F, 0x00, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); +DEFINE_GUID(CLSID_CCommonBrowser, 0xAF604EFE, 0x8897, 0x11D1, 0xB9, 0x44, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(CLSID_DeskBar, 0xecd4fc4c, 0x521c, 0x11d0, 0xb7, 0x92, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); +DEFINE_GUID(CLSID_DeskBarApp, 0x3ccf8a41, 0x5c85, 0x11d0, 0x97, 0x96, 0x00, 0xaa, 0x00, 0xb9, 0x0a, 0xdf); DEFINE_GUID(CGID_BrandCmdGroup, 0x25019D8C, 0x9EE0, 0x45C0, 0x88, 0x3B, 0x97, 0x2D, 0x48, 0x32, 0x5E, 0x18);

1 0

[tfaber] 59463: [KMTESTS:RTL] - Fix a warning
by tfaber＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: tfaber Date: Sat Jul 13 06:31:13 2013 New Revision: 59463 URL: http://svn.reactos.org/svn/reactos?rev=59463&view=rev Log: [KMTESTS:RTL] - Fix a warning Modified: trunk/rostests/kmtests/rtl/RtlException.c Modified: trunk/rostests/kmtests/rtl/RtlException.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Sat Jul 13 06:31:13 2013 @@ -11,7 +11,6 @@ { NTSTATUS ExceptionStatus; PCHAR Buffer[128]; - CHAR Value; /* Access a valid pointer - must not trigger SEH */ KmtStartSeh() @@ -20,7 +19,7 @@ /* Read from a NULL pointer - must cause an access violation */ KmtStartSeh() - Value = *(volatile CHAR *)NULL; + (void)*(volatile CHAR *)NULL; KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to a NULL pointer - must cause an access violation */ @@ -32,7 +31,7 @@ #if 0 //def KMT_KERNEL_MODE /* Read from MmBadPointer - must cause an access violation */ KmtStartSeh() - Value = *(volatile CHAR *)MmBadPointer; + (void)*(volatile CHAR *)MmBadPointer; KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to MmBadPointer - must cause an access violation */

1 0

[hbelusca] 59461: [CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll.
by hbelusca＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: hbelusca Date: Sat Jul 13 04:54:49 2013 New Revision: 59461 URL: http://svn.reactos.org/svn/reactos?rev=59461&view=rev Log: [CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. Added: trunk/reactos/win32ss/user/winsrv/consrv/ - copied from r59454, trunk/reactos/win32ss/user/consrv/ trunk/reactos/win32ss/user/winsrv/consrv.cmake - copied, changed from r59454, trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h - copied, changed from r59454, trunk/reactos/win32ss/user/consrv/conio.h trunk/reactos/win32ss/user/winsrv/usersrv/ (with props) trunk/reactos/win32ss/user/winsrv/usersrv.cmake - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/usersrv/api.h - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/api.h trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/harderror.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/lang/ - copied from r59454, trunk/reactos/win32ss/user/winsrv/lang/ trunk/reactos/win32ss/user/winsrv/usersrv/register.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/register.c trunk/reactos/win32ss/user/winsrv/usersrv/resource.h - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/resource.h trunk/reactos/win32ss/user/winsrv/usersrv/rsrc.rc - copied unchanged from r59454, trunk/reactos/win32ss/user/winsrv/rsrc.rc trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.h trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.rc - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.rc Removed: trunk/reactos/win32ss/user/consrv/ trunk/reactos/win32ss/user/winsrv/api.h trunk/reactos/win32ss/user/winsrv/consrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv/conio.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.spec trunk/reactos/win32ss/user/winsrv/harderror.c trunk/reactos/win32ss/user/winsrv/lang/ trunk/reactos/win32ss/user/winsrv/register.c trunk/reactos/win32ss/user/winsrv/resource.h trunk/reactos/win32ss/user/winsrv/rsrc.rc trunk/reactos/win32ss/user/winsrv/shutdown.c trunk/reactos/win32ss/user/winsrv/winsrv.h Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv/alias.c trunk/reactos/win32ss/user/winsrv/consrv/alias.h trunk/reactos/win32ss/user/winsrv/consrv/api.h trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.h trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.rc trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/handle.h trunk/reactos/win32ss/user/winsrv/consrv/heap.h trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h trunk/reactos/win32ss/user/winsrv/consrv/include/console.h trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h trunk/reactos/win32ss/user/winsrv/consrv/init.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h trunk/reactos/win32ss/user/winsrv/consrv/procinit.h trunk/reactos/win32ss/user/winsrv/consrv/resource.h trunk/reactos/win32ss/user/winsrv/consrv/settings.c trunk/reactos/win32ss/user/winsrv/init.c trunk/reactos/win32ss/user/winsrv/winsrv.rc trunk/reactos/win32ss/user/winsrv/winsrv.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists… Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL… Removed: trunk/reactos/win32ss/user/winsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/api.h?… Copied: trunk/reactos/win32ss/user/winsrv/consrv.cmake (from r59454, trunk/reactos/win32ss/user/consrv/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Removed: trunk/reactos/win32ss/user/winsrv/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Removed: trunk/reactos/win32ss/user/winsrv/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.… Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Removed: trunk/reactos/win32ss/user/winsrv/consrv/consrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Copied: trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h (from r59454, trunk/reactos/win32ss/user/consrv/conio.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Removed: trunk/reactos/win32ss/user/winsrv/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/harder… Modified: trunk/reactos/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/init.c… Removed: trunk/reactos/win32ss/user/winsrv/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/regist… Removed: trunk/reactos/win32ss/user/winsrv/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/resour… Removed: trunk/reactos/win32ss/user/winsrv/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/rsrc.r… Removed: trunk/reactos/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/shutdo… Copied: trunk/reactos/win32ss/user/winsrv/usersrv.cmake (from r59454, trunk/reactos/win32ss/user/winsrv/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/api.h (from r59454, trunk/reactos/win32ss/user/winsrv/api.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c (from r59454, trunk/reactos/win32ss/user/winsrv/harderror.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/init.c (from r59454, trunk/reactos/win32ss/user/winsrv/init.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/register.c (from r59454, trunk/reactos/win32ss/user/winsrv/register.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/resource.h (from r59454, trunk/reactos/win32ss/user/winsrv/resource.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c (from r59454, trunk/reactos/win32ss/user/winsrv/shutdown.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h (from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Copied: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.rc (from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… Removed: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… Modified: trunk/reactos/win32ss/user/winsrv/winsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… Modified: trunk/reactos/win32ss/user/winsrv/winsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv…

1 0

[aandrejevic] 59460: [NTVDM] Implement the IOCTL command in VDM DOS. Rewrite the BIOS video pages support to use only one console buffer (not yet complete). Fix the BIOS video mode table and severa...
by aandrejevic＠svn.reactos.org 13 Jul '13

13 Jul '13

Author: aandrejevic Date: Sat Jul 13 01:56:36 2013 New Revision: 59460 URL: http://svn.reactos.org/svn/reactos?rev=59460&view=rev Log: [NTVDM] Implement the IOCTL command in VDM DOS. Rewrite the BIOS video pages support to use only one console buffer (not yet complete). Fix the BIOS video mode table and several bugs in video functions. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Jul 13 01:56:36 2013 @@ -26,58 +26,46 @@ static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; static BYTE CurrentVideoMode = BIOS_DEFAULT_VIDEO_MODE; static BYTE CurrentVideoPage = 0; -static HANDLE ConsoleBuffers[BIOS_MAX_PAGES] = { NULL }; -static LPVOID ConsoleFramebuffers[BIOS_MAX_PAGES] = { NULL }; -static HANDLE ConsoleMutexes[BIOS_MAX_PAGES] = { NULL }; +static COORD BiosCursorPositions[BIOS_MAX_PAGES]; +static HANDLE BiosGraphicsOutput = NULL; +static LPVOID ConsoleFramebuffer = NULL; +static HANDLE ConsoleMutex = NULL; static BOOLEAN VideoNeedsUpdate = TRUE; static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; static VIDEO_MODE VideoModes[] = { - /* Width | Height | Text | Colors | Gray | Pages | Segment */ + /* Width | Height | Text | Bpp | Gray | Pages | Segment */ { 40, 25, TRUE, 16, TRUE, 8, 0xB800}, /* Mode 00h */ { 40, 25, TRUE, 16, FALSE, 8, 0xB800}, /* Mode 01h */ { 80, 25, TRUE, 16, TRUE, 8, 0xB800}, /* Mode 02h */ { 80, 25, TRUE, 16, FALSE, 8, 0xB800}, /* Mode 03h */ - { 320, 200, FALSE, 4, FALSE, 4, 0xB800}, /* Mode 04h */ - { 320, 200, FALSE, 4, TRUE, 4, 0xB800}, /* Mode 05h */ - { 640, 200, FALSE, 2, FALSE, 2, 0xB800}, /* Mode 06h */ - { 80, 25, TRUE, 3, FALSE, 1, 0xB000}, /* Mode 07h */ + { 320, 200, FALSE, 2, FALSE, 1, 0xB800}, /* Mode 04h */ + { 320, 200, FALSE, 2, TRUE, 1, 0xB800}, /* Mode 05h */ + { 640, 200, FALSE, 1, FALSE, 1, 0xB800}, /* Mode 06h */ + { 80, 25, TRUE, 8, FALSE, 1, 0xB000}, /* Mode 07h */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 08h - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 09h - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Ah - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Bh - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Ch - not used */ - { 320, 200, FALSE, 16, FALSE, 8, 0xA000}, /* Mode 0Dh */ - { 640, 200, FALSE, 16, FALSE, 4, 0xA000}, /* Mode 0Eh */ - { 640, 350, FALSE, 3, FALSE, 2, 0xA000}, /* Mode 0Fh */ - { 640, 350, FALSE, 4, FALSE, 2, 0xA000}, /* Mode 10h */ - { 640, 480, FALSE, 2, FALSE, 1, 0xA000}, /* Mode 11h */ - { 640, 480, FALSE, 16, FALSE, 1, 0xA000}, /* Mode 12h */ - { 640, 480, FALSE, 256, FALSE, 1, 0xA000} /* Mode 13h */ + { 320, 200, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 0Dh */ + { 640, 200, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 0Eh */ + { 640, 350, FALSE, 1, FALSE, 1, 0xA000}, /* Mode 0Fh */ + { 640, 350, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 10h */ + { 640, 480, FALSE, 1, FALSE, 1, 0xA000}, /* Mode 11h */ + { 640, 480, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 12h */ + { 320, 200, FALSE, 8, FALSE, 1, 0xA000} /* Mode 13h */ }; /* PRIVATE FUNCTIONS **********************************************************/ - -static INT BiosColorNumberToBits(DWORD Colors) -{ - INT i; - - /* Find the index of the highest-order bit */ - for (i = 31; i >= 0; i--) if (Colors & (1 << i)) break; - - /* Special case for zero */ - if (i == 0) i = 32; - - return i; -} static DWORD BiosGetVideoPageSize() { INT i; DWORD BufferSize = VideoModes[CurrentVideoMode].Width * VideoModes[CurrentVideoMode].Height - * BiosColorNumberToBits(VideoModes[CurrentVideoMode].Colors) + * VideoModes[CurrentVideoMode].Bpp / 8; for (i = 0; i < 32; i++) if ((1 << i) >= BufferSize) break; @@ -87,16 +75,15 @@ static BYTE BiosVideoAddressToPage(ULONG Address) { - return (Address - (VideoModes[CurrentVideoMode].Segment << 4)) + return (Address - BiosGetVideoMemoryStart()) / BiosGetVideoPageSize(); } static COORD BiosVideoAddressToCoord(ULONG Address) { COORD Result = {0, 0}; - INT BitsPerPixel; - BYTE PageStart = BiosVideoAddressToPage(Address) * BiosGetVideoPageSize(); - DWORD Offset = Address - (VideoModes[CurrentVideoMode].Segment << 4) - PageStart; + DWORD PageStart = BiosVideoAddressToPage(Address) * BiosGetVideoPageSize(); + DWORD Offset = Address - BiosGetVideoMemoryStart() - PageStart; if (VideoModes[CurrentVideoMode].Text) { @@ -105,11 +92,9 @@ } else { - BitsPerPixel = BiosColorNumberToBits(VideoModes[CurrentVideoMode].Colors); - - Result.X = ((Offset * 8) / BitsPerPixel) + Result.X = ((Offset * 8) / VideoModes[CurrentVideoMode].Bpp) % VideoModes[CurrentVideoMode].Width; - Result.Y = ((Offset * 8) / BitsPerPixel) + Result.Y = ((Offset * 8) / VideoModes[CurrentVideoMode].Bpp) / VideoModes[CurrentVideoMode].Width; } @@ -157,127 +142,166 @@ return TRUE; } -/* PUBLIC FUNCTIONS ***********************************************************/ - -BYTE BiosGetVideoMode() -{ - return CurrentVideoMode; -} - -BOOLEAN BiosSetVideoMode(BYTE ModeNumber) +static BOOLEAN BiosCreateGraphicsBuffer(BYTE ModeNumber) { INT i; - COORD Coord; CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; LPBITMAPINFO BitmapInfo; LPWORD PaletteIndex; + /* Allocate a bitmap info structure */ + BitmapInfo = (LPBITMAPINFO)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(BITMAPINFOHEADER) + + (1 << VideoModes[ModeNumber].Bpp) + * sizeof(WORD)); + if (BitmapInfo == NULL) return FALSE; + + /* Fill the bitmap info header */ + ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); + BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + BitmapInfo->bmiHeader.biWidth = VideoModes[ModeNumber].Width; + BitmapInfo->bmiHeader.biHeight = VideoModes[ModeNumber].Height; + BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biCompression = BI_RGB; + BitmapInfo->bmiHeader.biBitCount = VideoModes[ModeNumber].Bpp; + + /* Calculate the image size */ + BitmapInfo->bmiHeader.biSizeImage = BitmapInfo->bmiHeader.biWidth + * BitmapInfo->bmiHeader.biHeight + * (BitmapInfo->bmiHeader.biBitCount >> 3); + + /* Fill the palette data */ + PaletteIndex = (LPWORD)((ULONG_PTR)BitmapInfo + sizeof(BITMAPINFOHEADER)); + for (i = 0; i < (1 << VideoModes[ModeNumber].Bpp); i++) + { + PaletteIndex[i] = i; + } + + /* Fill the console graphics buffer info */ + GraphicsBufferInfo.dwBitMapInfoLength = sizeof(BITMAPINFOHEADER) + + (1 << VideoModes[ModeNumber].Bpp) + * sizeof(WORD); + GraphicsBufferInfo.lpBitMapInfo = BitmapInfo; + GraphicsBufferInfo.dwUsage = DIB_PAL_COLORS; + + /* Create the buffer */ + BiosGraphicsOutput = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + CONSOLE_GRAPHICS_BUFFER, + &GraphicsBufferInfo); + + /* Save the framebuffer address and mutex */ + ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; + ConsoleMutex = GraphicsBufferInfo.hMutex; + + /* Free the bitmap information */ + HeapFree(GetProcessHeap(), 0, BitmapInfo); + + return TRUE; +} + +static VOID BiosDestroyGraphicsBuffer() +{ + CloseHandle(ConsoleMutex); + CloseHandle(BiosGraphicsOutput); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BYTE BiosGetVideoMode() +{ + return CurrentVideoMode; +} + +BOOLEAN BiosSetVideoMode(BYTE ModeNumber) +{ + COORD Coord; + /* Make sure this is a valid video mode */ if (ModeNumber > BIOS_MAX_VIDEO_MODE) return FALSE; if (VideoModes[ModeNumber].Pages == 0) return FALSE; - /* Free the current buffers */ - for (i = 0; i < VideoModes[CurrentVideoMode].Pages; i++) - { - if (ConsoleBuffers[i] != NULL) CloseHandle(ConsoleBuffers[i]); - if (!VideoModes[CurrentVideoMode].Text) CloseHandle(ConsoleMutexes[i]); - } - - if (VideoModes[ModeNumber].Text) - { - /* Page 0 is CONOUT$ */ - ConsoleBuffers[0] = CreateFile(TEXT("CONOUT$"), - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - - /* Set the current page to page 0 */ - CurrentVideoPage = 0; - - /* Create console buffers for other pages */ - for (i = 1; i < VideoModes[ModeNumber].Pages; i++) - { - ConsoleBuffers[i] = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - CONSOLE_TEXTMODE_BUFFER, - NULL); - } - - /* Set the size for the buffers */ - for (i = 0; i < VideoModes[ModeNumber].Pages; i++) - { - Coord.X = VideoModes[ModeNumber].Width; - Coord.Y = VideoModes[ModeNumber].Height; - - SetConsoleScreenBufferSize(ConsoleBuffers[i], Coord); - } - } - else - { - /* Allocate a bitmap info structure */ - BitmapInfo = (LPBITMAPINFO)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(BITMAPINFOHEADER) - + VideoModes[ModeNumber].Colors - * sizeof(WORD)); - if (BitmapInfo == NULL) return FALSE; - - /* Fill the bitmap info header */ - ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); - BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - BitmapInfo->bmiHeader.biWidth = VideoModes[ModeNumber].Width; - BitmapInfo->bmiHeader.biHeight = VideoModes[ModeNumber].Height; - BitmapInfo->bmiHeader.biPlanes = 1; - BitmapInfo->bmiHeader.biCompression = BI_RGB; - BitmapInfo->bmiHeader.biBitCount = BiosColorNumberToBits(VideoModes[ModeNumber].Colors); - - /* Calculate the image size */ - BitmapInfo->bmiHeader.biSizeImage = BitmapInfo->bmiHeader.biWidth - * BitmapInfo->bmiHeader.biHeight - * (BitmapInfo->bmiHeader.biBitCount >> 3); - - /* Fill the palette data */ - PaletteIndex = (LPWORD)((ULONG_PTR)BitmapInfo + sizeof(BITMAPINFOHEADER)); - for (i = 0; i < VideoModes[ModeNumber].Colors; i++) - { - PaletteIndex[i] = i; - } - - /* Create a console buffer for each page */ - for (i = 0; i < VideoModes[ModeNumber].Pages; i++) - { - /* Fill the console graphics buffer info */ - GraphicsBufferInfo.dwBitMapInfoLength = sizeof(BITMAPINFOHEADER) - + VideoModes[ModeNumber].Colors - * sizeof(WORD); - GraphicsBufferInfo.lpBitMapInfo = BitmapInfo; - GraphicsBufferInfo.dwUsage = DIB_PAL_COLORS; - - /* Create the buffer */ - ConsoleBuffers[i] = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - CONSOLE_GRAPHICS_BUFFER, - &GraphicsBufferInfo); - - /* Save the framebuffer address and mutex */ - ConsoleFramebuffers[i] = GraphicsBufferInfo.lpBitMap; - ConsoleMutexes[i] = GraphicsBufferInfo.hMutex; - } - - /* Free the bitmap information */ - HeapFree(GetProcessHeap(), 0, BitmapInfo); - } - - /* Set the active page console buffer */ - SetConsoleActiveScreenBuffer(ConsoleBuffers[CurrentVideoPage]); - - /* Update the mode number */ + /* Set the new video mode size */ + Coord.X = VideoModes[ModeNumber].Width; + Coord.Y = VideoModes[ModeNumber].Height; + + if (VideoModes[ModeNumber].Text && VideoModes[CurrentVideoMode].Text) + { + /* Switching from text mode to another text mode */ + + /* Resize the text buffer */ + SetConsoleScreenBufferSize(BiosConsoleOutput, Coord); + } + else if (VideoModes[ModeNumber].Text && !VideoModes[CurrentVideoMode].Text) + { + /* Switching from graphics mode to text mode */ + + /* Resize the text buffer */ + SetConsoleScreenBufferSize(BiosConsoleOutput, Coord); + + /* Change the active screen buffer to the text buffer */ + SetConsoleActiveScreenBuffer(BiosConsoleOutput); + + /* Cleanup the graphics buffer */ + BiosDestroyGraphicsBuffer(); + } + else if (!VideoModes[ModeNumber].Text && VideoModes[CurrentVideoMode].Text) + { + /* Switching from text mode to graphics mode */ + if (!BiosCreateGraphicsBuffer(ModeNumber)) return FALSE; + + SetConsoleActiveScreenBuffer(BiosGraphicsOutput); + } + else if (!VideoModes[ModeNumber].Text && !VideoModes[CurrentVideoMode].Text) + { + /* Switching from graphics mode to another graphics mode */ + + /* Temporarily switch to the text mode buffer */ + SetConsoleActiveScreenBuffer(BiosConsoleOutput); + + /* Cleanup the current graphics mode buffer */ + BiosDestroyGraphicsBuffer(); + + /* Create a new graphics mode buffer */ + if (!BiosCreateGraphicsBuffer(ModeNumber)) return FALSE; + + /* Switch to it */ + SetConsoleActiveScreenBuffer(BiosGraphicsOutput); + } + + /* Set the video mode */ CurrentVideoMode = ModeNumber; + + return TRUE; +} + +BOOLEAN BiosSetVideoPage(BYTE PageNumber) +{ + ULONG PageStart; + CONSOLE_SCREEN_BUFFER_INFO BufferInfo; + + /* Make sure this is a valid page number */ + if (PageNumber >= VideoModes[CurrentVideoMode].Pages) return FALSE; + + /* Save the current console buffer in the video memory */ + PageStart = BiosGetVideoMemoryStart() + CurrentVideoPage * BiosGetVideoPageSize(); + BiosUpdateVideoMemory(PageStart, PageStart + BiosGetVideoPageSize()); + + /* Save the cursor */ + if (!GetConsoleScreenBufferInfo(BiosConsoleOutput, &BufferInfo)) return FALSE; + BiosCursorPositions[CurrentVideoPage] = BufferInfo.dwCursorPosition; + + /* Set the page */ + CurrentVideoPage = PageNumber; + + /* Update the console */ + PageStart = BiosGetVideoMemoryStart() + CurrentVideoPage * BiosGetVideoPageSize(); + BiosUpdateConsole(PageStart, PageStart + BiosGetVideoPageSize()); + + /* Set the cursor */ + SetConsoleCursorPosition(BiosConsoleOutput, BiosCursorPositions[PageNumber]); return TRUE; } @@ -296,8 +320,7 @@ if (!VideoNeedsUpdate) return; /* Redraw the screen */ - InvalidateConsoleDIBits(ConsoleBuffers[CurrentVideoPage], - &UpdateRectangle); + InvalidateConsoleDIBits(BiosGraphicsOutput, &UpdateRectangle); /* Clear the update flag */ VideoNeedsUpdate = FALSE; @@ -363,6 +386,10 @@ { return FALSE; } + + /* Store the cursor position */ + ZeroMemory(&BiosCursorPositions, sizeof(BiosCursorPositions)); + BiosCursorPositions[0] = BiosSavedBufferInfo.dwCursorPosition; /* Set the default video mode */ BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); @@ -399,20 +426,14 @@ VOID BiosCleanup() { - INT i; - /* Restore the old screen buffer */ SetConsoleActiveScreenBuffer(BiosConsoleOutput); /* Restore the screen buffer size */ SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize); - /* Free the buffers */ - for (i = 0; i < VideoModes[CurrentVideoMode].Pages; i++) - { - if (ConsoleBuffers[i] != NULL) CloseHandle(ConsoleBuffers[i]); - if (!VideoModes[CurrentVideoMode].Text) CloseHandle(ConsoleMutexes[i]); - } + /* Free the graphics buffer */ + if (!VideoModes[CurrentVideoMode].Text) BiosDestroyGraphicsBuffer(); /* Close the console handles */ if (BiosConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleInput); @@ -423,7 +444,6 @@ { ULONG i; COORD Coordinates; - BYTE Page; COORD Origin = { 0, 0 }; COORD UnitSize = { 1, 1 }; CHAR_INFO Character; @@ -440,11 +460,8 @@ /* Get the coordinates */ Coordinates = BiosVideoAddressToCoord(i); - /* Get the page number */ - Page = BiosVideoAddressToPage(i); - - /* Make sure the page is valid */ - if (Page >= VideoModes[CurrentVideoMode].Pages) continue; + /* Make sure this is the current page */ + if (BiosVideoAddressToPage(i) != CurrentVideoPage) continue; /* Fill the rectangle structure */ Rect.Left = Coordinates.X; @@ -457,7 +474,7 @@ Character.Attributes = *((PBYTE)((ULONG_PTR)BaseAddress + i + 1)); /* Write the character */ - WriteConsoleOutputA(ConsoleBuffers[Page], + WriteConsoleOutputA(BiosConsoleOutput, &Character, UnitSize, Origin, @@ -467,16 +484,16 @@ else { /* Wait for the mutex object */ - WaitForSingleObject(ConsoleMutexes[CurrentVideoPage], INFINITE); + WaitForSingleObject(ConsoleMutex, INFINITE); /* Copy the data to the framebuffer */ - RtlCopyMemory((LPVOID)((ULONG_PTR)ConsoleFramebuffers[CurrentVideoPage] + RtlCopyMemory((LPVOID)((ULONG_PTR)ConsoleFramebuffer + StartAddress - BiosGetVideoMemoryStart()), (LPVOID)((ULONG_PTR)BaseAddress + StartAddress), EndAddress - StartAddress); /* Release the mutex */ - ReleaseMutex(ConsoleMutexes[CurrentVideoPage]); + ReleaseMutex(ConsoleMutex); /* Check if this is the first time the rectangle is updated */ if (!VideoNeedsUpdate) @@ -507,7 +524,6 @@ { ULONG i; COORD Coordinates; - BYTE Page; WORD Attribute; DWORD CharsWritten; @@ -519,17 +535,14 @@ /* Get the coordinates */ Coordinates = BiosVideoAddressToCoord(i); - /* Get the page number */ - Page = BiosVideoAddressToPage(i); - - /* Make sure the page is valid */ - if (Page >= VideoModes[CurrentVideoMode].Pages) continue; + /* Make sure this is the current page */ + if (BiosVideoAddressToPage(i) != CurrentVideoPage) continue; /* Check if this is a character byte or an attribute byte */ - if ((i - (VideoModes[CurrentVideoMode].Segment << 4)) % 2 == 0) + if ((i - BiosGetVideoMemoryStart()) % 2 == 0) { /* This is a regular character */ - ReadConsoleOutputCharacterA(ConsoleBuffers[Page], + ReadConsoleOutputCharacterA(BiosConsoleOutput, (LPSTR)((ULONG_PTR)BaseAddress + i), sizeof(CHAR), Coordinates, @@ -538,7 +551,7 @@ else { /* This is an attribute */ - ReadConsoleOutputAttribute(ConsoleBuffers[Page], + ReadConsoleOutputAttribute(BiosConsoleOutput, &Attribute, sizeof(CHAR), Coordinates, @@ -551,16 +564,16 @@ else { /* Wait for the mutex object */ - WaitForSingleObject(ConsoleMutexes[CurrentVideoPage], INFINITE); + WaitForSingleObject(ConsoleMutex, INFINITE); /* Copy the data to the emulator memory */ RtlCopyMemory((LPVOID)((ULONG_PTR)BaseAddress + StartAddress), - (LPVOID)((ULONG_PTR)ConsoleFramebuffers[CurrentVideoPage] + (LPVOID)((ULONG_PTR)ConsoleFramebuffer + StartAddress - BiosGetVideoMemoryStart()), EndAddress - StartAddress); /* Release the mutex */ - ReleaseMutex(ConsoleMutexes[CurrentVideoPage]); + ReleaseMutex(ConsoleMutex); } } @@ -627,6 +640,7 @@ DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); + // TODO: Add support for multiple pages! switch (HIBYTE(Eax)) { /* Set Video Mode */ @@ -648,7 +662,7 @@ /* Set the cursor */ CursorInfo.dwSize = (CursorHeight * 100) / CONSOLE_FONT_HEIGHT; CursorInfo.bVisible = !Invisible; - SetConsoleCursorInfo(ConsoleBuffers[CurrentVideoPage], &CursorInfo); + SetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); break; } @@ -662,7 +676,15 @@ Position.X = LOBYTE(Edx); Position.Y = HIBYTE(Edx); - SetConsoleCursorPosition(ConsoleBuffers[HIBYTE(Ebx)], Position); + BiosCursorPositions[HIBYTE(Ebx)] = Position; + + /* Check if this is the current video page */ + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Yes, change the actual cursor */ + SetConsoleCursorPosition(BiosConsoleOutput, Position); + } + break; } @@ -675,9 +697,7 @@ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; /* Retrieve the data */ - GetConsoleCursorInfo(ConsoleBuffers[HIBYTE(Ebx)], &CursorInfo); - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); + GetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); /* Find the first line */ StartLine = 32 - ((CursorInfo.dwSize * 32) / 100); @@ -686,8 +706,8 @@ EmulatorSetRegister(EMULATOR_REG_AX, 0); EmulatorSetRegister(EMULATOR_REG_CX, (StartLine << 8) | 0x1F); EmulatorSetRegister(EMULATOR_REG_DX, - LOWORD(ScreenBufferInfo.dwCursorPosition.Y) << 8 - || LOWORD(ScreenBufferInfo.dwCursorPosition.X)); + (LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].Y) << 8) + | LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].X)); break; } @@ -701,14 +721,7 @@ if (LOBYTE(Eax) == CurrentVideoPage) break; /* Change the video page */ - CurrentVideoPage = LOBYTE(Eax); - - /* Set the active page console buffer */ - SetConsoleActiveScreenBuffer(ConsoleBuffers[CurrentVideoPage]); - - /* Restore the cursor to (0, 0) */ - Position.X = Position.Y = 0; - SetConsoleCursorPosition(BiosConsoleOutput, Position); + BiosSetVideoPage(LOBYTE(Eax)); break; } @@ -724,10 +737,11 @@ Character.Char.UnicodeChar = L' '; Character.Attributes = HIBYTE(Ebx); Position.X = Rect.Left; + if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax); else Position.Y = Rect.Top + LOBYTE(Eax); - ScrollConsoleScreenBuffer(ConsoleBuffers[CurrentVideoPage], + ScrollConsoleScreenBuffer(BiosConsoleOutput, &Rect, &Rect, Position, @@ -743,25 +757,32 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Get the cursor position */ - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); - - /* Read at cursor position */ - Rect.Left = ScreenBufferInfo.dwCursorPosition.X; - Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Get the cursor position */ + GetConsoleScreenBufferInfo(BiosConsoleOutput, + &ScreenBufferInfo); + + /* Read at cursor position */ + Rect.Left = ScreenBufferInfo.dwCursorPosition.X; + Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; - /* Read the console output */ - ReadConsoleOutput(ConsoleBuffers[HIBYTE(Ebx)], - &Character, - BufferSize, - Origin, - &Rect); - - /* Return the result */ - EmulatorSetRegister(EMULATOR_REG_AX, - (LOBYTE(Character.Attributes) << 8) - | Character.Char.AsciiChar); + /* Read the console output */ + ReadConsoleOutput(BiosConsoleOutput, + &Character, + BufferSize, + Origin, + &Rect); + + /* Return the result */ + EmulatorSetRegister(EMULATOR_REG_AX, + (LOBYTE(Character.Attributes) << 8) + | Character.Char.AsciiChar); + } + else + { + // TODO: NOT IMPLEMENTED + } break; } @@ -774,23 +795,30 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Get the cursor position */ - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); - - /* Write the attribute to the output */ - FillConsoleOutputAttribute(ConsoleBuffers[HIBYTE(Ebx)], - LOBYTE(Ebx), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(ConsoleBuffers[HIBYTE(Ebx)], - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Get the cursor position */ + GetConsoleScreenBufferInfo(BiosConsoleOutput, + &ScreenBufferInfo); + + /* Write the attribute to the output */ + FillConsoleOutputAttribute(BiosConsoleOutput, + LOBYTE(Ebx), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + + /* Write the character to the output */ + FillConsoleOutputCharacterA(BiosConsoleOutput, + LOBYTE(Eax), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + } + else + { + // TODO: NOT IMPLEMENTED + } break; } @@ -803,16 +831,22 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Get the cursor position */ - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(ConsoleBuffers[HIBYTE(Ebx)], - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Get the cursor position */ + GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); + + /* Write the character to the output */ + FillConsoleOutputCharacterA(BiosConsoleOutput, + LOBYTE(Eax), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + } + else + { + // TODO: NOT IMPLEMENTED + } break; } @@ -827,10 +861,10 @@ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; /* Set the attribute */ - SetConsoleTextAttribute(ConsoleBuffers[HIBYTE(Ebx)], LOBYTE(Ebx)); + SetConsoleTextAttribute(BiosConsoleOutput, LOBYTE(Ebx)); /* Write the character */ - WriteConsoleA(ConsoleBuffers[HIBYTE(Ebx)], + WriteConsoleA(BiosConsoleOutput, &Character, sizeof(CHAR), &NumWritten, Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Sat Jul 13 01:56:36 2013 @@ -38,7 +38,7 @@ DWORD Width; DWORD Height; BOOLEAN Text; - DWORD Colors; + BYTE Bpp; BOOLEAN Gray; BYTE Pages; WORD Segment; Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sat Jul 13 01:56:36 2013 @@ -906,6 +906,56 @@ DosWriteFile(DOS_OUTPUT_HANDLE, &Character, sizeof(CHAR), &BytesWritten); } +VOID DosHandleIoctl(BYTE ControlCode, WORD FileHandle) +{ + HANDLE Handle = DosGetRealHandle(FileHandle); + + if (Handle == INVALID_HANDLE_VALUE) + { + /* Doesn't exist */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_FILE_NOT_FOUND); + } + + switch (ControlCode) + { + /* Get Device Information */ + case 0x00: + { + WORD InfoWord = 0; + + if (Handle == DosSystemFileTable[0]) + { + /* Console input */ + InfoWord |= 1 << 0; + } + else if (Handle == DosSystemFileTable[1]) + { + /* Console output */ + InfoWord |= 1 << 1; + } + + /* It is a character device */ + InfoWord |= 1 << 7; + + /* Return the device information word */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_DX, InfoWord); + + break; + } + + /* Unsupported control code */ + default: + { + DPRINT1("Unsupported IOCTL: 0x%02X\n", ControlCode); + + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_PARAMETER); + } + } +} + VOID DosInt20h(WORD CodeSegment) { /* This is the exit interrupt */ @@ -1326,6 +1376,14 @@ break; } + /* IOCTL */ + case 0x44: + { + DosHandleIoctl(LOBYTE(Eax), LOWORD(Ebx)); + + break; + } + /* Allocate Memory */ case 0x48: {

1 0

[hbelusca] 59459: [KERNEL32] CreateEvent --> NtCreateEvent --> NotificationEvent or SynchronizationEvent (contrary to CreateTimer --> NtCreateTimer).
by hbelusca＠svn.reactos.org 12 Jul '13

12 Jul '13

Author: hbelusca Date: Fri Jul 12 22:27:12 2013 New Revision: 59459 URL: http://svn.reactos.org/svn/reactos?rev=59459&view=rev Log: [KERNEL32] CreateEvent --> NtCreateEvent --> NotificationEvent or SynchronizationEvent (contrary to CreateTimer --> NtCreateTimer). Modified: trunk/reactos/dll/win32/kernel32/client/synch.c Modified: trunk/reactos/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Fri Jul 12 22:27:12 2013 @@ -590,7 +590,7 @@ CreateNtObjectFromWin32Api(Event, Event, EVENT, lpEventAttributes, lpName, - bManualReset ? NotificationTimer : SynchronizationTimer, + bManualReset ? NotificationEvent : SynchronizationEvent, bInitialState); }

1 0

[pschweitzer] 59458: [CONFIGURE.SH] Fix formatting
by pschweitzer＠svn.reactos.org 12 Jul '13

12 Jul '13

Author: pschweitzer Date: Fri Jul 12 10:13:45 2013 New Revision: 59458 URL: http://svn.reactos.org/svn/reactos?rev=59458&view=rev Log: [CONFIGURE.SH] Fix formatting Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59458&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Fri Jul 12 10:13:45 2013 @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$ROS_ARCH" = "x" ]; then - echo Could not detect RosBE. - exit 1 + echo Could not detect RosBE. + exit 1 fi BUILD_ENVIRONMENT=MinGW @@ -11,8 +11,8 @@ REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH usage() { -echo Invalid parameter given. -exit 1 + echo Invalid parameter given. + exit 1 } CMAKE_GENERATOR="Ninja" @@ -41,9 +41,9 @@ done if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then - echo Creating directories in $REACTOS_OUTPUT_PATH - mkdir -p "$REACTOS_OUTPUT_PATH" - cd "$REACTOS_OUTPUT_PATH" + echo Creating directories in $REACTOS_OUTPUT_PATH + mkdir -p "$REACTOS_OUTPUT_PATH" + cd "$REACTOS_OUTPUT_PATH" fi mkdir -p host-tools reactos

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