Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 71491: [BROWSEUI] - Remove the proxy implementation of CExplorerBand. Add IDropTarget and IDropSource interfaces.
by gadamopoulos＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: gadamopoulos Date: Wed Jun 1 20:13:27 2016 New Revision: 71491 URL: http://svn.reactos.org/svn/reactos?rev=71491&view=rev Log: [BROWSEUI] - Remove the proxy implementation of CExplorerBand. Add IDropTarget and IDropSource interfaces. Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Wed Jun 1 20:13:27 2016 @@ -12,143 +12,8 @@ return ShellObjectCreator<CExplorerBand>(riid, ppv); } -CExplorerBand::CExplorerBand() : - m_OnWinEventShown(FALSE) -{ -#if 0 - 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; - } -#endif +CExplorerBand::CExplorerBand() +{ } CExplorerBand::~CExplorerBand() @@ -158,32 +23,12 @@ // *** 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; } @@ -192,48 +37,18 @@ // *** 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; } @@ -242,20 +57,6 @@ // *** 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; } @@ -264,32 +65,12 @@ // *** 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; } @@ -298,32 +79,12 @@ // *** 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; } @@ -332,18 +93,6 @@ // *** 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; } @@ -352,52 +101,18 @@ // *** 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; } @@ -406,17 +121,6 @@ // *** 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; } @@ -425,63 +129,24 @@ // *** 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; } @@ -490,193 +155,69 @@ // *** 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; -} - + 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; -} - + 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; -} - + 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; } @@ -687,3 +228,40 @@ return E_NOTIMPL; } +// *** IDropTarget methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::DragLeave() +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::Drop(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// *** IDropSource methods *** +HRESULT STDMETHODCALLTYPE CExplorerBand::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CExplorerBand::GiveFeedback(DWORD dwEffect) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Wed Jun 1 20:13:27 2016 @@ -1,69 +1,11 @@ #pragma once -#if 0 -// Is this a CToolsBand that implements a toolbar? -class CToolBand : +#define WM_USER_SHELLEVENT WM_USER+88 +#define WM_USER_FOLDEREVENT WM_USER+88 + +class CExplorerBand : + public CComCoClass<CExplorerBand, &CLSID_ExplorerBand>, 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, @@ -72,74 +14,22 @@ public IServiceProvider, public IBandNavigate, public IWinEventHandler, - public INamespaceProxy + public INamespaceProxy, + public IDispatch, + public IDropSource, + public IDropTarget, + public CWindowImpl<CExplorerBand, CWindow, CControlWinTraits> { -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); +private: + class NodeInfo + { + public: + LPITEMIDLIST absolutePidl; + LPITEMIDLIST relativePidl; + BOOL expanded; + }; - // *** 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(); @@ -200,6 +90,16 @@ 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); + + // *** IDropTarget methods *** + virtual HRESULT STDMETHODCALLTYPE DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT STDMETHODCALLTYPE DragOver(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT STDMETHODCALLTYPE DragLeave(); + virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect); + + // *** IDropSource methods *** + virtual HRESULT STDMETHODCALLTYPE QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState); + virtual HRESULT STDMETHODCALLTYPE GiveFeedback(DWORD dwEffect); DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBAND) DECLARE_NOT_AGGREGATABLE(CExplorerBand) @@ -207,7 +107,7 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CExplorerBand) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) COM_INTERFACE_ENTRY_IID(IID_IBandNavigate, IBandNavigate) COM_INTERFACE_ENTRY_IID(IID_INamespaceProxy, INamespaceProxy) @@ -221,6 +121,9 @@ COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistStream) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) END_COM_MAP() + + BEGIN_MSG_MAP(CExplorerBand) + END_MSG_MAP() }; extern "C"

1 0

[pschweitzer] 71490: [FS_REC] Fix the UDFS recognizer. Patch by Pater Hater. CORE-9816
by pschweitzer＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: pschweitzer Date: Wed Jun 1 20:13:15 2016 New Revision: 71490 URL: http://svn.reactos.org/svn/reactos?rev=71490&view=rev Log: [FS_REC] Fix the UDFS recognizer. Patch by Pater Hater. CORE-9816 Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] Wed Jun 1 20:13:15 2016 @@ -25,74 +25,80 @@ { PVOLSTRUCTDESC VolumeStructDesc = NULL; LARGE_INTEGER Offset; - ULONG State = 0; + BOOLEAN ret = FALSE; + int i; PAGED_CODE(); - Offset.QuadPart = UDFS_VRS_START_OFFSET; - while (TRUE) + Offset.QuadPart = 16 * SectorSize; + for (i = 0; i < 16; i++) { if (!FsRecReadBlock(DeviceObject, &Offset, SectorSize, SectorSize, - (PVOID)&VolumeStructDesc, + (PVOID *)&VolumeStructDesc, NULL)) { break; } - switch (State) + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_BEA01, + VSD_STD_ID_LEN)) { - case 0: + DPRINT("BEA01 found\n"); + } - if (!strncmp((const char*)VolumeStructDesc->Ident, - VSD_STD_ID_BEA01, - VSD_STD_ID_LEN)) - { - State = 1; - } - else - { - ExFreePool(VolumeStructDesc); - return FALSE; - } - break; + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_NSR03, + VSD_STD_ID_LEN)) + { + DPRINT("NSR03 found\n"); + ret = TRUE; + } - case 1: + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_NSR02, + VSD_STD_ID_LEN)) + { + DPRINT("NSR02 found\n"); + ret = TRUE; + } - if (!strncmp((const char*)VolumeStructDesc->Ident, - VSD_STD_ID_NSR03, - VSD_STD_ID_LEN) || - !strncmp((const char*)VolumeStructDesc->Ident, - VSD_STD_ID_NSR02, - VSD_STD_ID_LEN)) - { - State = 2; - } - break; + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_TEA01, + VSD_STD_ID_LEN)) + { + DPRINT("TEA01 found\n"); + } - case 2: + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_CD001, + VSD_STD_ID_LEN)) + { + DPRINT("CD001 found\n"); + } - if (!strncmp((const char*)VolumeStructDesc->Ident, - VSD_STD_ID_TEA01, - VSD_STD_ID_LEN)) - { - ExFreePool(VolumeStructDesc); - return TRUE; - } - break; + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_CDW02, + VSD_STD_ID_LEN)) + { + DPRINT("CDW02 found\n"); + } + + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_BOOT2, + VSD_STD_ID_LEN)) + { + DPRINT("BOOT2 found\n"); } Offset.QuadPart += SectorSize; - if (Offset.QuadPart == UDFS_AVDP_SECTOR) - { - ExFreePool(VolumeStructDesc); - return FALSE; - } } - ExFreePool(VolumeStructDesc); - return TRUE; + if (VolumeStructDesc) + ExFreePool(VolumeStructDesc); + return ret; } NTSTATUS

1 0

[mjansen] 71489: [APPHELP] Fix a possible out of bounds write.
by mjansen＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: mjansen Date: Wed Jun 1 19:37:25 2016 New Revision: 71489 URL: http://svn.reactos.org/svn/reactos?rev=71489&view=rev Log: [APPHELP] Fix a possible out of bounds write. Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Wed Jun 1 19:37:25 2016 @@ -272,13 +272,14 @@ TAGID WINAPI SdbBeginWriteListTag(PDB db, TAG tag) { TAGID list_id; + DWORD dum = 0; if (!SdbpCheckTagType(tag, TAG_TYPE_LIST)) return TAGID_NULL; list_id = db->write_iter; SdbpWrite(db, &tag, sizeof(TAG)); - db->write_iter += sizeof(DWORD); /* reserve some memory for storing list size */ + SdbpWrite(db, &dum, sizeof(dum)); /* reserve some memory for storing list size */ return list_id; }

1 0

[mjansen] 71488: [APPHELP] Remove all NT api usage from sdbwrite, split apphelp.h header out in preparation of xml2sdb CORE-11302
by mjansen＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: mjansen Date: Wed Jun 1 19:10:19 2016 New Revision: 71488 URL: http://svn.reactos.org/svn/reactos?rev=71488&view=rev Log: [APPHELP] Remove all NT api usage from sdbwrite, split apphelp.h header out in preparation of xml2sdb CORE-11302 Added: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h (with props) trunk/reactos/dll/appcompat/apphelp/sdbtagid.h (with props) trunk/reactos/dll/appcompat/apphelp/sdbtypes.h (with props) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbwrite.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Wed Jun 1 19:10:19 2016 @@ -1,6 +1,6 @@ /* * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015 Mark Jansen + * Copyright 2015,2016 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,22 +24,7 @@ extern "C" { #endif -typedef WORD TAG; -typedef DWORD TAGID; -typedef DWORD TAGREF; -typedef UINT64 QWORD; - -#define TAGREF_NULL (0) -#define TAGREF_ROOT (0) - -typedef struct _DB { - HANDLE file; - DWORD size; - PBYTE data; - TAGID stringtable; - DWORD write_iter; - GUID database_id; -} DB, *PDB; +#include "sdbtypes.h" /* Flags for SdbInitDatabase */ #define HID_DOS_PATHS 0x1 @@ -56,19 +41,14 @@ } SDB, *HSDB; typedef struct tagATTRINFO { - TAG type; - DWORD flags; - union { - QWORD qwattr; - DWORD dwattr; - WCHAR *lpattr; - }; + TAG type; + DWORD flags; + union { + QWORD qwattr; + DWORD dwattr; + WCHAR *lpattr; + }; } ATTRINFO, *PATTRINFO; - -typedef enum _PATH_TYPE { - DOS_PATH, - NT_PATH -} PATH_TYPE; typedef enum _SHIM_LOG_LEVEL { SHIM_ERR = 1, @@ -85,46 +65,12 @@ #define SHIM_INFO(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) -/* sdbapi.c */ -void SdbpHeapInit(void); -void SdbpHeapDeinit(void); -#if SDBAPI_DEBUG_ALLOC +#include "sdbpapi.h" -LPVOID SdbpAlloc(SIZE_T size, int line, const char* file); -LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size, int line, const char* file); -void SdbpFree(LPVOID mem, int line, const char* file); - -#define SdbAlloc(size) SdbpAlloc(size, __LINE__, __FILE__) -#define SdbReAlloc(mem, size) SdbpReAlloc(mem, size, __LINE__, __FILE__) -#define SdbFree(mem) SdbpFree(mem, __LINE__, __FILE__) - -#else - -LPVOID SdbpAlloc(SIZE_T size); -LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size); -void SdbpFree(LPVOID mem); - -#define SdbAlloc(size) SdbpAlloc(size) -#define SdbReAlloc(mem, size) SdbpReAlloc(mem, size) -#define SdbFree(mem) SdbpFree(mem) - -#endif - -typedef struct tagMEMMAPPED { - HANDLE file; - HANDLE section; - PBYTE view; - SIZE_T size; - SIZE_T mapped_size; -} MEMMAPPED, *PMEMMAPPED; - -BOOL WINAPI SdbpOpenMemMappedFile(LPCWSTR path, PMEMMAPPED mapping); -void WINAPI SdbpCloseMemMappedFile(PMEMMAPPED mapping); -DWORD SdbpStrlen(LPCWSTR string); PWSTR SdbpStrDup(LPCWSTR string); BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type); BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type); -PDB WINAPI SdbpCreate(void); + PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type); void WINAPI SdbCloseDatabase(PDB); BOOL WINAPI SdbIsNullGUID(CONST GUID *Guid); @@ -145,198 +91,7 @@ #define ATTRIBUTE_AVAILABLE 0x1 #define ATTRIBUTE_FAILED 0x2 -#define TAGID_NULL 0x0 -#define TAGID_ROOT 0x0 - -/* The above definition of TAGID_ROOT is used in winapi and can be found - * on msdn it but doesn't make sense, especially internally, because - * TAGID represents offset into database data and there is a header at - * offset 0, NOT a tag. Therfore, this definition should be used internally - * to represent first valid TAGID. Header size is 12 bytes. */ -#define _TAGID_ROOT 12 - -#define TAG_TYPE_MASK 0xF000 - -#define TAG_TYPE_NULL 0x1000 -#define TAG_TYPE_BYTE 0x2000 -#define TAG_TYPE_WORD 0x3000 -#define TAG_TYPE_DWORD 0x4000 -#define TAG_TYPE_QWORD 0x5000 -#define TAG_TYPE_STRINGREF 0x6000 -#define TAG_TYPE_LIST 0x7000 -#define TAG_TYPE_STRING 0x8000 -#define TAG_TYPE_BINARY 0x9000 - -#define TAG_NULL 0x0 - -/* TAG_TYPE_NULL */ -#define TAG_INCLUDE (0x1 | TAG_TYPE_NULL) -#define TAG_GENERAL (0x2 | TAG_TYPE_NULL) -#define TAG_MATCH_LOGIC_NOT (0x3 | TAG_TYPE_NULL) -#define TAG_APPLY_ALL_SHIMS (0x4 | TAG_TYPE_NULL) -#define TAG_USE_SERVICE_PACK_FILES (0x5 | TAG_TYPE_NULL) -#define TAG_MITIGATION_OS (0x6 | TAG_TYPE_NULL) -#define TAG_BLOCK_UPGRADE (0x7 | TAG_TYPE_NULL) -#define TAG_INCLUDEEXCLUDEDLL (0x8 | TAG_TYPE_NULL) -#define TAG_RAC_EVENT_OFF (0x9 | TAG_TYPE_NULL) -#define TAG_TELEMETRY_OFF (0xA | TAG_TYPE_NULL) -#define TAG_SHIM_ENGINE_OFF (0xB | TAG_TYPE_NULL) -#define TAG_LAYER_PROPAGATION_OFF (0xC | TAG_TYPE_NULL) -#define TAG_REINSTALL_UPGRADE (0xD | TAG_TYPE_NULL) - -/* TAG_TYPE_BYTE */ - -/* TAG_TYPE_WORD */ -#define TAG_MATCH_MODE (0x1 | TAG_TYPE_WORD) -#define TAG_TAG (0x801 | TAG_TYPE_WORD) -#define TAG_INDEX_TAG (0x802 | TAG_TYPE_WORD) -#define TAG_INDEX_KEY (0x803 | TAG_TYPE_WORD) - -/* TAG_TYPE_DWORD */ -#define TAG_SIZE (0x1 | TAG_TYPE_DWORD) -#define TAG_OFFSET (0x2 | TAG_TYPE_DWORD) -#define TAG_CHECKSUM (0x3 | TAG_TYPE_DWORD) -#define TAG_SHIM_TAGID (0x4 | TAG_TYPE_DWORD) -#define TAG_PATCH_TAGID (0x5 | TAG_TYPE_DWORD) -#define TAG_MODULE_TYPE (0x6 | TAG_TYPE_DWORD) -#define TAG_VERDATEHI (0x7 | TAG_TYPE_DWORD) -#define TAG_VERDATELO (0x8 | TAG_TYPE_DWORD) -#define TAG_VERFILEOS (0x9 | TAG_TYPE_DWORD) -#define TAG_VERFILETYPE (0xA | TAG_TYPE_DWORD) -#define TAG_PE_CHECKSUM (0xB | TAG_TYPE_DWORD) -#define TAG_PREVOSMAJORVER (0xC | TAG_TYPE_DWORD) -#define TAG_PREVOSMINORVER (0xD | TAG_TYPE_DWORD) -#define TAG_PREVOSPLATFORMID (0xE | TAG_TYPE_DWORD) -#define TAG_PREVOSBUILDNO (0xF | TAG_TYPE_DWORD) -#define TAG_PROBLEMSEVERITY (0x10 | TAG_TYPE_DWORD) -#define TAG_LANGID (0x11 | TAG_TYPE_DWORD) -#define TAG_VER_LANGUAGE (0x12 | TAG_TYPE_DWORD) -#define TAG_ENGINE (0x14 | TAG_TYPE_DWORD) -#define TAG_HTMLHELPID (0x15 | TAG_TYPE_DWORD) -#define TAG_INDEX_FLAGS (0x16 | TAG_TYPE_DWORD) -#define TAG_FLAGS (0x17 | TAG_TYPE_DWORD) -#define TAG_DATA_VALUETYPE (0x18 | TAG_TYPE_DWORD) -#define TAG_DATA_DWORD (0x19 | TAG_TYPE_DWORD) -#define TAG_LAYER_TAGID (0x1A | TAG_TYPE_DWORD) -#define TAG_MSI_TRANSFORM_TAGID (0x1B | TAG_TYPE_DWORD) -#define TAG_LINKER_VERSION (0x1C | TAG_TYPE_DWORD) -#define TAG_LINK_DATE (0x1D | TAG_TYPE_DWORD) -#define TAG_UPTO_LINK_DATE (0x1E | TAG_TYPE_DWORD) -#define TAG_OS_SERVICE_PACK (0x1F | TAG_TYPE_DWORD) -#define TAG_FLAG_TAGID (0x20 | TAG_TYPE_DWORD) -#define TAG_RUNTIME_PLATFORM (0x21 | TAG_TYPE_DWORD) -#define TAG_OS_SKU (0x22 | TAG_TYPE_DWORD) -#define TAG_OS_PLATFORM (0x23 | TAG_TYPE_DWORD) -#define TAG_APP_NAME_RC_ID (0x24 | TAG_TYPE_DWORD) -#define TAG_VENDOR_NAME_RC_ID (0x25 | TAG_TYPE_DWORD) -#define TAG_SUMMARY_MSG_RC_ID (0x26 | TAG_TYPE_DWORD) -#define TAG_VISTA_SKU (0x27 | TAG_TYPE_DWORD) -#define TAG_DESCRIPTION_RC_ID (0x28 | TAG_TYPE_DWORD) -#define TAG_PARAMETER1_RC_ID (0x29 | TAG_TYPE_DWORD) -#define TAG_CONTEXT_TAGID (0x30 | TAG_TYPE_DWORD) -#define TAG_EXE_WRAPPER (0x31 | TAG_TYPE_DWORD) -#define TAG_URL_ID (0x32 | TAG_TYPE_DWORD) -#define TAG_TAGID (0x801 | TAG_TYPE_DWORD) - -/* TAG_TYPE_QWORD */ -#define TAG_TIME (0x1 | TAG_TYPE_QWORD) -#define TAG_BIN_FILE_VERSION (0x2 | TAG_TYPE_QWORD) -#define TAG_BIN_PRODUCT_VERSION (0x3 | TAG_TYPE_QWORD) -#define TAG_MODTIME (0x4 | TAG_TYPE_QWORD) -#define TAG_FLAG_MASK_KERNEL (0x5 | TAG_TYPE_QWORD) -#define TAG_UPTO_BIN_PRODUCT_VERSION (0x6 | TAG_TYPE_QWORD) -#define TAG_DATA_QWORD (0x7 | TAG_TYPE_QWORD) -#define TAG_FLAG_MASK_USER (0x8 | TAG_TYPE_QWORD) -#define TAG_FLAGS_NTVDM1 (0x9 | TAG_TYPE_QWORD) -#define TAG_FLAGS_NTVDM2 (0xA | TAG_TYPE_QWORD) -#define TAG_FLAGS_NTVDM3 (0xB | TAG_TYPE_QWORD) -#define TAG_FLAG_MASK_SHELL (0xC | TAG_TYPE_QWORD) -#define TAG_UPTO_BIN_FILE_VERSION (0xD | TAG_TYPE_QWORD) -#define TAG_FLAG_MASK_FUSION (0xE | TAG_TYPE_QWORD) -#define TAG_FLAG_PROCESSPARAM (0xF | TAG_TYPE_QWORD) -#define TAG_FLAG_LUA (0x10 | TAG_TYPE_QWORD) -#define TAG_FLAG_INSTALL (0x11 | TAG_TYPE_QWORD) - -/* TAG_TYPE_STRINGREF */ -#define TAG_NAME (0x1 | TAG_TYPE_STRINGREF) -#define TAG_DESCRIPTION (0x2 | TAG_TYPE_STRINGREF) -#define TAG_MODULE (0x3 | TAG_TYPE_STRINGREF) -#define TAG_API (0x4 | TAG_TYPE_STRINGREF) -#define TAG_VENDOR (0x5 | TAG_TYPE_STRINGREF) -#define TAG_APP_NAME (0x6 | TAG_TYPE_STRINGREF) -#define TAG_COMMAND_LINE (0x8 | TAG_TYPE_STRINGREF) -#define TAG_COMPANY_NAME (0x9 | TAG_TYPE_STRINGREF) -#define TAG_DLLFILE (0xA | TAG_TYPE_STRINGREF) -#define TAG_WILDCARD_NAME (0xB | TAG_TYPE_STRINGREF) -#define TAG_PRODUCT_NAME (0x10 | TAG_TYPE_STRINGREF) -#define TAG_PRODUCT_VERSION (0x11 | TAG_TYPE_STRINGREF) -#define TAG_FILE_DESCRIPTION (0x12 | TAG_TYPE_STRINGREF) -#define TAG_FILE_VERSION (0x13 | TAG_TYPE_STRINGREF) -#define TAG_ORIGINAL_FILENAME (0x14 | TAG_TYPE_STRINGREF) -#define TAG_INTERNAL_NAME (0x15 | TAG_TYPE_STRINGREF) -#define TAG_LEGAL_COPYRIGHT (0x16 | TAG_TYPE_STRINGREF) -#define TAG_16BIT_DESCRIPTION (0x17 | TAG_TYPE_STRINGREF) -#define TAG_APPHELP_DETAILS (0x18 | TAG_TYPE_STRINGREF) -#define TAG_LINK_URL (0x19 | TAG_TYPE_STRINGREF) -#define TAG_LINK_TEXT (0x1A | TAG_TYPE_STRINGREF) -#define TAG_APPHELP_TITLE (0x1B | TAG_TYPE_STRINGREF) -#define TAG_APPHELP_CONTACT (0x1C | TAG_TYPE_STRINGREF) -#define TAG_SXS_MANIFEST (0x1D | TAG_TYPE_STRINGREF) -#define TAG_DATA_STRING (0x1E | TAG_TYPE_STRINGREF) -#define TAG_MSI_TRANSFORM_FILE (0x1F | TAG_TYPE_STRINGREF) -#define TAG_16BIT_MODULE_NAME (0x20 | TAG_TYPE_STRINGREF) -#define TAG_LAYER_DISPLAYNAME (0x21 | TAG_TYPE_STRINGREF) -#define TAG_COMPILER_VERSION (0x22 | TAG_TYPE_STRINGREF) -#define TAG_ACTION_TYPE (0x23 | TAG_TYPE_STRINGREF) -#define TAG_EXPORT_NAME (0x24 | TAG_TYPE_STRINGREF) -#define TAG_URL (0x25 | TAG_TYPE_STRINGREF) - -/* TAG_TYPE_LIST */ -#define TAG_DATABASE (0x1 | TAG_TYPE_LIST) -#define TAG_LIBRARY (0x2 | TAG_TYPE_LIST) -#define TAG_INEXCLUD (0x3 | TAG_TYPE_LIST) -#define TAG_SHIM (0x4 | TAG_TYPE_LIST) -#define TAG_PATCH (0x5 | TAG_TYPE_LIST) -#define TAG_APP (0x6 | TAG_TYPE_LIST) -#define TAG_EXE (0x7 | TAG_TYPE_LIST) -#define TAG_MATCHING_FILE (0x8 | TAG_TYPE_LIST) -#define TAG_SHIM_REF (0x9| TAG_TYPE_LIST) -#define TAG_PATCH_REF (0xA | TAG_TYPE_LIST) -#define TAG_LAYER (0xB | TAG_TYPE_LIST) -#define TAG_FILE (0xC | TAG_TYPE_LIST) -#define TAG_APPHELP (0xD | TAG_TYPE_LIST) -#define TAG_LINK (0xE | TAG_TYPE_LIST) -#define TAG_DATA (0xF | TAG_TYPE_LIST) -#define TAG_MSI_TRANSFORM (0x10 | TAG_TYPE_LIST) -#define TAG_MSI_TRANSFORM_REF (0x11 | TAG_TYPE_LIST) -#define TAG_MSI_PACKAGE (0x12 | TAG_TYPE_LIST) -#define TAG_FLAG (0x13 | TAG_TYPE_LIST) -#define TAG_MSI_CUSTOM_ACTION (0x14 | TAG_TYPE_LIST) -#define TAG_FLAG_REF (0x15 | TAG_TYPE_LIST) -#define TAG_ACTION (0x16 | TAG_TYPE_LIST) -#define TAG_LOOKUP (0x17 | TAG_TYPE_LIST) -#define TAG_CONTEXT (0x18 | TAG_TYPE_LIST) -#define TAG_CONTEXT_REF (0x19 | TAG_TYPE_LIST) -#define TAG_SPC (0x20 | TAG_TYPE_LIST) -#define TAG_STRINGTABLE (0x801 | TAG_TYPE_LIST) -#define TAG_INDEXES (0x802 | TAG_TYPE_LIST) -#define TAG_INDEX (0x803 | TAG_TYPE_LIST) - -/* TAG_TYPE_STRING */ -#define TAG_STRINGTABLE_ITEM (0x801 | TAG_TYPE_STRING) - -/* TAG_TYPE_BINARY */ -#define TAG_PATCH_BITS (0x2 | TAG_TYPE_BINARY) -#define TAG_FILE_BITS (0x3 | TAG_TYPE_BINARY) -#define TAG_EXE_ID (0x4 | TAG_TYPE_BINARY) -#define TAG_DATA_BITS (0x5 | TAG_TYPE_BINARY) -#define TAG_MSI_PACKAGE_ID (0x6 | TAG_TYPE_BINARY) -#define TAG_DATABASE_ID (0x7 | TAG_TYPE_BINARY) -#define TAG_CONTEXT_PLATFORM_ID (0x8 | TAG_TYPE_BINARY) -#define TAG_CONTEXT_BRANCH_ID (0x9 | TAG_TYPE_BINARY) -#define TAG_FIX_ID (0x10 | TAG_TYPE_BINARY) -#define TAG_APP_ID (0x11 | TAG_TYPE_BINARY) -#define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY) +#include "sdbtagid.h" #ifdef __cplusplus } // extern "C" Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Wed Jun 1 19:10:19 2016 @@ -202,12 +202,61 @@ HeapFree(SdbpHeap(), 0, mem); } -PDB WINAPI SdbpCreate(void) -{ - PDB db = (PDB)SdbAlloc(sizeof(DB)); +PDB WINAPI SdbpCreate(LPCWSTR path, PATH_TYPE type, BOOL write) +{ + NTSTATUS Status; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + PDB db; + + if (type == DOS_PATH) + { + if (!RtlDosPathNameToNtPathName_U(path, &str, NULL, NULL)) + return NULL; + } + else + RtlInitUnicodeString(&str, path); + /* SdbAlloc zeroes the memory. */ + db = (PDB)SdbAlloc(sizeof(DB)); + if (!db) + { + SHIM_ERR("Failed to allocate memory for shim database\n"); + return NULL; + } + + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); + + //Status = NtCreateFile(&db->file, FILE_GENERIC_READ | SYNCHRONIZE, + // &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, + // FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + Status = NtCreateFile(&db->file, (write ? FILE_GENERIC_WRITE : FILE_GENERIC_READ )| SYNCHRONIZE, + &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, + write ? FILE_SUPERSEDE : FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + + if (type == DOS_PATH) + RtlFreeUnicodeString(&str); + + if (!NT_SUCCESS(Status)) + { + SdbCloseDatabase(db); + SHIM_ERR("Failed to create shim database file: %lx\n", Status); + return NULL; + } + return db; } + +void WINAPI SdbpFlush(PDB db) +{ + IO_STATUS_BLOCK io; + NTSTATUS Status = NtWriteFile(db->file, NULL, NULL, NULL, &io, + db->data, db->write_iter, NULL, NULL); + if( !NT_SUCCESS(Status)) + SHIM_WARN("failed with 0x%lx\n", Status); +} + DWORD SdbpStrlen(PCWSTR string) { return (lstrlenW(string) + 1) * sizeof(WCHAR); @@ -315,43 +364,14 @@ PDB SdbpOpenDatabase(LPCWSTR path, PATH_TYPE type, PDWORD major, PDWORD minor) { - UNICODE_STRING str; - OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; PDB db; NTSTATUS Status; BYTE header[12]; - if (type == DOS_PATH) - { - if (!RtlDosPathNameToNtPathName_U(path, &str, NULL, NULL)) - return NULL; - } - else - RtlInitUnicodeString(&str, path); - - db = SdbpCreate(); + db = SdbpCreate(path, type, FALSE); if (!db) - { - SHIM_ERR("Failed to allocate memory for shim database\n"); return NULL; - } - - InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); - - Status = NtCreateFile(&db->file, FILE_GENERIC_READ | SYNCHRONIZE, - &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); - - if (type == DOS_PATH) - RtlFreeUnicodeString(&str); - - if (!NT_SUCCESS(Status)) - { - SdbCloseDatabase(db); - SHIM_ERR("Failed to open shim database file: 0x%lx\n", Status); - return NULL; - } db->size = GetFileSize(db->file, NULL); db->data = SdbAlloc(db->size); Added: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbp… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbpapi.h (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] Wed Jun 1 19:10:19 2016 @@ -0,0 +1,75 @@ +/* + * Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015,2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef SDBPAPI_H +#define SDBPAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +void SdbpHeapInit(void); +void SdbpHeapDeinit(void); + +#if SDBAPI_DEBUG_ALLOC + +LPVOID SdbpAlloc(SIZE_T size, int line, const char* file); +LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size, int line, const char* file); +void SdbpFree(LPVOID mem, int line, const char* file); + +#define SdbAlloc(size) SdbpAlloc(size, __LINE__, __FILE__) +#define SdbReAlloc(mem, size) SdbpReAlloc(mem, size, __LINE__, __FILE__) +#define SdbFree(mem) SdbpFree(mem, __LINE__, __FILE__) + +#else + +LPVOID SdbpAlloc(SIZE_T size); +LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size); +void SdbpFree(LPVOID mem); + +#define SdbAlloc(size) SdbpAlloc(size) +#define SdbReAlloc(mem, size) SdbpReAlloc(mem, size) +#define SdbFree(mem) SdbpFree(mem) + +#endif + +#if !defined(SDBWRITE_HOSTTOOL) +typedef struct tagMEMMAPPED { + HANDLE file; + HANDLE section; + PBYTE view; + SIZE_T size; + SIZE_T mapped_size; +} MEMMAPPED, *PMEMMAPPED; + +BOOL WINAPI SdbpOpenMemMappedFile(LPCWSTR path, PMEMMAPPED mapping); +void WINAPI SdbpCloseMemMappedFile(PMEMMAPPED mapping); +#endif + + +PDB WINAPI SdbpCreate(LPCWSTR path, PATH_TYPE type, BOOL write); +void WINAPI SdbpFlush(PDB db); +DWORD SdbpStrlen(LPCWSTR string); + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // SDBPAPI_H Propchange: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/apphelp/sdbtagid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbt… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbtagid.h (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbtagid.h [iso-8859-1] Wed Jun 1 19:10:19 2016 @@ -0,0 +1,217 @@ +/* + * Copyright 2013 Mislav Blaevic + * Copyright 2015,2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef SDBTAGID_H +#define SDBTAGID_H + + +#define TAGID_NULL 0x0 +#define TAGID_ROOT 0x0 + +/* The above definition of TAGID_ROOT is used in winapi and can be found + * on msdn it but doesn't make sense, especially internally, because + * TAGID represents offset into database data and there is a header at + * offset 0, NOT a tag. Therfore, this definition should be used internally + * to represent first valid TAGID. Header size is 12 bytes. */ +#define _TAGID_ROOT 12 + +#define TAG_TYPE_MASK 0xF000 + +#define TAG_TYPE_NULL 0x1000 +#define TAG_TYPE_BYTE 0x2000 +#define TAG_TYPE_WORD 0x3000 +#define TAG_TYPE_DWORD 0x4000 +#define TAG_TYPE_QWORD 0x5000 +#define TAG_TYPE_STRINGREF 0x6000 +#define TAG_TYPE_LIST 0x7000 +#define TAG_TYPE_STRING 0x8000 +#define TAG_TYPE_BINARY 0x9000 + +#define TAG_NULL 0x0 + +/* TAG_TYPE_NULL */ +#define TAG_INCLUDE (0x1 | TAG_TYPE_NULL) +#define TAG_GENERAL (0x2 | TAG_TYPE_NULL) +#define TAG_MATCH_LOGIC_NOT (0x3 | TAG_TYPE_NULL) +#define TAG_APPLY_ALL_SHIMS (0x4 | TAG_TYPE_NULL) +#define TAG_USE_SERVICE_PACK_FILES (0x5 | TAG_TYPE_NULL) +#define TAG_MITIGATION_OS (0x6 | TAG_TYPE_NULL) +#define TAG_BLOCK_UPGRADE (0x7 | TAG_TYPE_NULL) +#define TAG_INCLUDEEXCLUDEDLL (0x8 | TAG_TYPE_NULL) +#define TAG_RAC_EVENT_OFF (0x9 | TAG_TYPE_NULL) +#define TAG_TELEMETRY_OFF (0xA | TAG_TYPE_NULL) +#define TAG_SHIM_ENGINE_OFF (0xB | TAG_TYPE_NULL) +#define TAG_LAYER_PROPAGATION_OFF (0xC | TAG_TYPE_NULL) +#define TAG_REINSTALL_UPGRADE (0xD | TAG_TYPE_NULL) + +/* TAG_TYPE_BYTE */ + +/* TAG_TYPE_WORD */ +#define TAG_MATCH_MODE (0x1 | TAG_TYPE_WORD) +#define TAG_TAG (0x801 | TAG_TYPE_WORD) +#define TAG_INDEX_TAG (0x802 | TAG_TYPE_WORD) +#define TAG_INDEX_KEY (0x803 | TAG_TYPE_WORD) + +/* TAG_TYPE_DWORD */ +#define TAG_SIZE (0x1 | TAG_TYPE_DWORD) +#define TAG_OFFSET (0x2 | TAG_TYPE_DWORD) +#define TAG_CHECKSUM (0x3 | TAG_TYPE_DWORD) +#define TAG_SHIM_TAGID (0x4 | TAG_TYPE_DWORD) +#define TAG_PATCH_TAGID (0x5 | TAG_TYPE_DWORD) +#define TAG_MODULE_TYPE (0x6 | TAG_TYPE_DWORD) +#define TAG_VERDATEHI (0x7 | TAG_TYPE_DWORD) +#define TAG_VERDATELO (0x8 | TAG_TYPE_DWORD) +#define TAG_VERFILEOS (0x9 | TAG_TYPE_DWORD) +#define TAG_VERFILETYPE (0xA | TAG_TYPE_DWORD) +#define TAG_PE_CHECKSUM (0xB | TAG_TYPE_DWORD) +#define TAG_PREVOSMAJORVER (0xC | TAG_TYPE_DWORD) +#define TAG_PREVOSMINORVER (0xD | TAG_TYPE_DWORD) +#define TAG_PREVOSPLATFORMID (0xE | TAG_TYPE_DWORD) +#define TAG_PREVOSBUILDNO (0xF | TAG_TYPE_DWORD) +#define TAG_PROBLEMSEVERITY (0x10 | TAG_TYPE_DWORD) +#define TAG_LANGID (0x11 | TAG_TYPE_DWORD) +#define TAG_VER_LANGUAGE (0x12 | TAG_TYPE_DWORD) +#define TAG_ENGINE (0x14 | TAG_TYPE_DWORD) +#define TAG_HTMLHELPID (0x15 | TAG_TYPE_DWORD) +#define TAG_INDEX_FLAGS (0x16 | TAG_TYPE_DWORD) +#define TAG_FLAGS (0x17 | TAG_TYPE_DWORD) +#define TAG_DATA_VALUETYPE (0x18 | TAG_TYPE_DWORD) +#define TAG_DATA_DWORD (0x19 | TAG_TYPE_DWORD) +#define TAG_LAYER_TAGID (0x1A | TAG_TYPE_DWORD) +#define TAG_MSI_TRANSFORM_TAGID (0x1B | TAG_TYPE_DWORD) +#define TAG_LINKER_VERSION (0x1C | TAG_TYPE_DWORD) +#define TAG_LINK_DATE (0x1D | TAG_TYPE_DWORD) +#define TAG_UPTO_LINK_DATE (0x1E | TAG_TYPE_DWORD) +#define TAG_OS_SERVICE_PACK (0x1F | TAG_TYPE_DWORD) +#define TAG_FLAG_TAGID (0x20 | TAG_TYPE_DWORD) +#define TAG_RUNTIME_PLATFORM (0x21 | TAG_TYPE_DWORD) +#define TAG_OS_SKU (0x22 | TAG_TYPE_DWORD) +#define TAG_OS_PLATFORM (0x23 | TAG_TYPE_DWORD) +#define TAG_APP_NAME_RC_ID (0x24 | TAG_TYPE_DWORD) +#define TAG_VENDOR_NAME_RC_ID (0x25 | TAG_TYPE_DWORD) +#define TAG_SUMMARY_MSG_RC_ID (0x26 | TAG_TYPE_DWORD) +#define TAG_VISTA_SKU (0x27 | TAG_TYPE_DWORD) +#define TAG_DESCRIPTION_RC_ID (0x28 | TAG_TYPE_DWORD) +#define TAG_PARAMETER1_RC_ID (0x29 | TAG_TYPE_DWORD) +#define TAG_CONTEXT_TAGID (0x30 | TAG_TYPE_DWORD) +#define TAG_EXE_WRAPPER (0x31 | TAG_TYPE_DWORD) +#define TAG_URL_ID (0x32 | TAG_TYPE_DWORD) +#define TAG_TAGID (0x801 | TAG_TYPE_DWORD) + +/* TAG_TYPE_QWORD */ +#define TAG_TIME (0x1 | TAG_TYPE_QWORD) +#define TAG_BIN_FILE_VERSION (0x2 | TAG_TYPE_QWORD) +#define TAG_BIN_PRODUCT_VERSION (0x3 | TAG_TYPE_QWORD) +#define TAG_MODTIME (0x4 | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_KERNEL (0x5 | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_PRODUCT_VERSION (0x6 | TAG_TYPE_QWORD) +#define TAG_DATA_QWORD (0x7 | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_USER (0x8 | TAG_TYPE_QWORD) +#define TAG_FLAGS_NTVDM1 (0x9 | TAG_TYPE_QWORD) +#define TAG_FLAGS_NTVDM2 (0xA | TAG_TYPE_QWORD) +#define TAG_FLAGS_NTVDM3 (0xB | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_SHELL (0xC | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_FILE_VERSION (0xD | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_FUSION (0xE | TAG_TYPE_QWORD) +#define TAG_FLAG_PROCESSPARAM (0xF | TAG_TYPE_QWORD) +#define TAG_FLAG_LUA (0x10 | TAG_TYPE_QWORD) +#define TAG_FLAG_INSTALL (0x11 | TAG_TYPE_QWORD) + +/* TAG_TYPE_STRINGREF */ +#define TAG_NAME (0x1 | TAG_TYPE_STRINGREF) +#define TAG_DESCRIPTION (0x2 | TAG_TYPE_STRINGREF) +#define TAG_MODULE (0x3 | TAG_TYPE_STRINGREF) +#define TAG_API (0x4 | TAG_TYPE_STRINGREF) +#define TAG_VENDOR (0x5 | TAG_TYPE_STRINGREF) +#define TAG_APP_NAME (0x6 | TAG_TYPE_STRINGREF) +#define TAG_COMMAND_LINE (0x8 | TAG_TYPE_STRINGREF) +#define TAG_COMPANY_NAME (0x9 | TAG_TYPE_STRINGREF) +#define TAG_DLLFILE (0xA | TAG_TYPE_STRINGREF) +#define TAG_WILDCARD_NAME (0xB | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_NAME (0x10 | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_VERSION (0x11 | TAG_TYPE_STRINGREF) +#define TAG_FILE_DESCRIPTION (0x12 | TAG_TYPE_STRINGREF) +#define TAG_FILE_VERSION (0x13 | TAG_TYPE_STRINGREF) +#define TAG_ORIGINAL_FILENAME (0x14 | TAG_TYPE_STRINGREF) +#define TAG_INTERNAL_NAME (0x15 | TAG_TYPE_STRINGREF) +#define TAG_LEGAL_COPYRIGHT (0x16 | TAG_TYPE_STRINGREF) +#define TAG_16BIT_DESCRIPTION (0x17 | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_DETAILS (0x18 | TAG_TYPE_STRINGREF) +#define TAG_LINK_URL (0x19 | TAG_TYPE_STRINGREF) +#define TAG_LINK_TEXT (0x1A | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_TITLE (0x1B | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_CONTACT (0x1C | TAG_TYPE_STRINGREF) +#define TAG_SXS_MANIFEST (0x1D | TAG_TYPE_STRINGREF) +#define TAG_DATA_STRING (0x1E | TAG_TYPE_STRINGREF) +#define TAG_MSI_TRANSFORM_FILE (0x1F | TAG_TYPE_STRINGREF) +#define TAG_16BIT_MODULE_NAME (0x20 | TAG_TYPE_STRINGREF) +#define TAG_LAYER_DISPLAYNAME (0x21 | TAG_TYPE_STRINGREF) +#define TAG_COMPILER_VERSION (0x22 | TAG_TYPE_STRINGREF) +#define TAG_ACTION_TYPE (0x23 | TAG_TYPE_STRINGREF) +#define TAG_EXPORT_NAME (0x24 | TAG_TYPE_STRINGREF) +#define TAG_URL (0x25 | TAG_TYPE_STRINGREF) + +/* TAG_TYPE_LIST */ +#define TAG_DATABASE (0x1 | TAG_TYPE_LIST) +#define TAG_LIBRARY (0x2 | TAG_TYPE_LIST) +#define TAG_INEXCLUD (0x3 | TAG_TYPE_LIST) +#define TAG_SHIM (0x4 | TAG_TYPE_LIST) +#define TAG_PATCH (0x5 | TAG_TYPE_LIST) +#define TAG_APP (0x6 | TAG_TYPE_LIST) +#define TAG_EXE (0x7 | TAG_TYPE_LIST) +#define TAG_MATCHING_FILE (0x8 | TAG_TYPE_LIST) +#define TAG_SHIM_REF (0x9| TAG_TYPE_LIST) +#define TAG_PATCH_REF (0xA | TAG_TYPE_LIST) +#define TAG_LAYER (0xB | TAG_TYPE_LIST) +#define TAG_FILE (0xC | TAG_TYPE_LIST) +#define TAG_APPHELP (0xD | TAG_TYPE_LIST) +#define TAG_LINK (0xE | TAG_TYPE_LIST) +#define TAG_DATA (0xF | TAG_TYPE_LIST) +#define TAG_MSI_TRANSFORM (0x10 | TAG_TYPE_LIST) +#define TAG_MSI_TRANSFORM_REF (0x11 | TAG_TYPE_LIST) +#define TAG_MSI_PACKAGE (0x12 | TAG_TYPE_LIST) +#define TAG_FLAG (0x13 | TAG_TYPE_LIST) +#define TAG_MSI_CUSTOM_ACTION (0x14 | TAG_TYPE_LIST) +#define TAG_FLAG_REF (0x15 | TAG_TYPE_LIST) +#define TAG_ACTION (0x16 | TAG_TYPE_LIST) +#define TAG_LOOKUP (0x17 | TAG_TYPE_LIST) +#define TAG_CONTEXT (0x18 | TAG_TYPE_LIST) +#define TAG_CONTEXT_REF (0x19 | TAG_TYPE_LIST) +#define TAG_SPC (0x20 | TAG_TYPE_LIST) +#define TAG_STRINGTABLE (0x801 | TAG_TYPE_LIST) +#define TAG_INDEXES (0x802 | TAG_TYPE_LIST) +#define TAG_INDEX (0x803 | TAG_TYPE_LIST) + +/* TAG_TYPE_STRING */ +#define TAG_STRINGTABLE_ITEM (0x801 | TAG_TYPE_STRING) + +/* TAG_TYPE_BINARY */ +#define TAG_PATCH_BITS (0x2 | TAG_TYPE_BINARY) +#define TAG_FILE_BITS (0x3 | TAG_TYPE_BINARY) +#define TAG_EXE_ID (0x4 | TAG_TYPE_BINARY) +#define TAG_DATA_BITS (0x5 | TAG_TYPE_BINARY) +#define TAG_MSI_PACKAGE_ID (0x6 | TAG_TYPE_BINARY) +#define TAG_DATABASE_ID (0x7 | TAG_TYPE_BINARY) +#define TAG_CONTEXT_PLATFORM_ID (0x8 | TAG_TYPE_BINARY) +#define TAG_CONTEXT_BRANCH_ID (0x9 | TAG_TYPE_BINARY) +#define TAG_FIX_ID (0x10 | TAG_TYPE_BINARY) +#define TAG_APP_ID (0x11 | TAG_TYPE_BINARY) +#define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY) + +#endif // SDBTAGID_H Propchange: trunk/reactos/dll/appcompat/apphelp/sdbtagid.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/apphelp/sdbtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbt… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbtypes.h (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbtypes.h [iso-8859-1] Wed Jun 1 19:10:19 2016 @@ -0,0 +1,54 @@ +/* + * Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015,2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef SDBTYPES_H +#define SDBTYPES_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef WORD TAG; +typedef DWORD TAGID; +typedef DWORD TAGREF; +typedef UINT64 QWORD; + +#define TAGREF_NULL (0) +#define TAGREF_ROOT (0) + +typedef struct _DB { + HANDLE file; + DWORD size; + BYTE* data; + TAGID stringtable; + DWORD write_iter; + GUID database_id; +} DB, *PDB; + +typedef enum _PATH_TYPE { + DOS_PATH, + NT_PATH +} PATH_TYPE; + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // SDBTYPES_H Propchange: trunk/reactos/dll/appcompat/apphelp/sdbtypes.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Wed Jun 1 19:10:19 2016 @@ -18,24 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if !defined(SDBWRITE_HOSTTOOL) + #define WIN32_NO_STATUS #include "windows.h" #include "ntndk.h" #include "apphelp.h" - #include "wine/unicode.h" - -static void WINAPI SdbpFlush(PDB db) -{ - IO_STATUS_BLOCK io; - NTSTATUS Status = NtWriteFile(db->file, NULL, NULL, NULL, &io, - db->data, db->write_iter, NULL, NULL); - if( !NT_SUCCESS(Status)) - SHIM_WARN("failed with 0x%lx\n", Status); -} - -static void WINAPI SdbpWrite(PDB db, LPCVOID data, DWORD size) +#else + +#include <typedefs.h> +#include <guiddef.h> + +#include "sdbtypes.h" +#include "sdbpapi.h" +#include "sdbtagid.h" + +#endif + + +static void WINAPI SdbpWrite(PDB db, const void* data, DWORD size) { if (db->write_iter + size > db->size) { @@ -64,42 +67,11 @@ { static const DWORD version_major = 2, version_minor = 1; static const char* magic = "sdbf"; - NTSTATUS Status; - IO_STATUS_BLOCK io; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; PDB db; - if (type == DOS_PATH) - { - if (!RtlDosPathNameToNtPathName_U(path, &str, NULL, NULL)) - return NULL; - } - else - RtlInitUnicodeString(&str, path); - - db = SdbpCreate(); + db = SdbpCreate(path, type, TRUE); if (!db) - { - SHIM_ERR("Failed to allocate memory for shim database\n"); return NULL; - } - - InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); - - Status = NtCreateFile(&db->file, FILE_GENERIC_WRITE | SYNCHRONIZE, - &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - FILE_SUPERSEDE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); - - if (type == DOS_PATH) - RtlFreeUnicodeString(&str); - - if (!NT_SUCCESS(Status)) - { - SdbCloseDatabase(db); - SHIM_ERR("Failed to create shim database file: %lx\n", Status); - return NULL; - } db->size = sizeof(DWORD) + sizeof(DWORD) + strlen(magic); db->data = SdbAlloc(db->size); @@ -249,7 +221,7 @@ * * @return TRUE if it succeeds, FALSE if it fails. */ -BOOL WINAPI SdbWriteBinaryTag(PDB db, TAG tag, PBYTE data, DWORD size) +BOOL WINAPI SdbWriteBinaryTag(PDB db, TAG tag, BYTE* data, DWORD size) { if (!SdbpCheckTagType(tag, TAG_TYPE_BINARY)) return FALSE; @@ -260,6 +232,7 @@ return TRUE; } +#if !defined(SDBWRITE_HOSTTOOL) /** * Writes data from a file to the specified shim database. * @@ -283,6 +256,7 @@ SdbpCloseMemMappedFile(&mapped); return TRUE; } +#endif /** * Writes a list tag to specified database All subsequent SdbWrite* functions shall write to

1 0

[hbelusca] 71487: [BOOTDATA] - Swap two values so that they are listed in alphabetical order. - PaintDesktopVersion is a DWORD value, as such, use a correct initializer.
by hbelusca＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: hbelusca Date: Wed Jun 1 15:34:56 2016 New Revision: 71487 URL: http://svn.reactos.org/svn/reactos?rev=71487&view=rev Log: [BOOTDATA] - Swap two values so that they are listed in alphabetical order. - PaintDesktopVersion is a DWORD value, as such, use a correct initializer. Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Jun 1 15:34:56 2016 @@ -57,7 +57,7 @@ HKCU,"Control Panel\Desktop","DragFullWindows",2,"1" HKCU,"Control Panel\Desktop","DragHeight",0x00000000,"4" HKCU,"Control Panel\Desktop","DragWidth",0x00000000,"4" -HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" +HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,0x0 HKCU,"Control Panel\Desktop","HungAppTimeout",2,"5000" HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"0" HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Wed Jun 1 15:34:56 2016 @@ -1386,13 +1386,13 @@ ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","AppInit_DLLs",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DeviceNotSelectedTimeout",0x00000000,"15" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","GDIProcessHandleQuota",0x00010001,0x2710 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Spooler",0x00000000,"yes" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","swapdisk",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","TransmissionRetryTimeout",0x00000000,"90" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","USERProcessHandleQuota",0x00010001,0x2710 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1 ;-------------------------------- STRINGS -------------------------------

1 0

[hbelusca] 71486: [WIN32K] Display a nice ReactOS version desktop watermark (with different fonts) when the corresponding registry values are set. See http://winaero.com/blog/a-new-way-to-display-t...
by hbelusca＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: hbelusca Date: Wed Jun 1 15:24:38 2016 New Revision: 71486 URL: http://svn.reactos.org/svn/reactos?rev=71486&view=rev Log: [WIN32K] Display a nice ReactOS version desktop watermark (with different fonts) when the corresponding registry values are set. See http://winaero.com/blog/a-new-way-to-display-the-windows-version-on-your-de… for more details (which works on Windows 2003 too). CORE-11349 #resolve Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Jun 1 15:24:38 2016 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Win32k subsystem * PURPOSE: Desktops * FILE: subsystems/win32/win32k/ntuser/desktop.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES ******************************************************************/ @@ -246,41 +246,201 @@ return STATUS_SUCCESS; } -static INT GetSystemVersionString(PWSTR* buffer) -{ - static WCHAR wszVersion[256] = L""; - int len = 0; - - if (!*wszVersion) - { -#if 0 // Disabled until versioning in win32k gets correctly implemented (hbelusca, r66750). - RTL_OSVERSIONINFOEXW versionInfo; - - versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); - - if (!NT_SUCCESS(RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo))) - return 0; - - if (versionInfo.dwMajorVersion <= 4) - len = swprintf(wszVersion, - L"ReactOS Version %lu.%lu %s Build %lu", - versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, - versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); - else - len = swprintf(wszVersion, - L"ReactOS %s (Build %lu)", - versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); -#else - len = swprintf(wszVersion, L"ReactOS Version %S %S", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); +static NTSTATUS +GetSystemVersionString(OUT PWSTR pwszzVersion, + IN SIZE_T cchDest, + IN BOOLEAN InSafeMode, + IN BOOLEAN AppendNtSystemRoot) +{ + NTSTATUS Status; + + RTL_OSVERSIONINFOEXW VerInfo; + UNICODE_STRING CSDVersionString; +#if 0 + UNICODE_STRING CurBuildNmString; #endif + RTL_QUERY_REGISTRY_TABLE VersionConfigurationTable[2] = + { + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"CSDVersion", + &CSDVersionString, + REG_NONE, NULL, 0 + }, + +#if 0 + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"CurrentBuildNumber", + &CurBuildNmString, + REG_NONE, NULL, 0 + }, +#endif + + {0} + }; + + WCHAR VersionBuffer[256]; + PWCHAR EndBuffer; + + VerInfo.dwOSVersionInfoSize = sizeof(VerInfo); + + /* + * This call is uniquely used to retrieve the current CSD numbers. + * All the rest (major, minor, ...) is either retrieved from the + * SharedUserData structure, or from the registry. + */ + RtlGetVersion((PRTL_OSVERSIONINFOW)&VerInfo); + + /* + * In kernel-mode, szCSDVersion is not initialized. Initialize it + * and query its value from the registry. + */ + RtlZeroMemory(VerInfo.szCSDVersion, sizeof(VerInfo.szCSDVersion)); + RtlInitEmptyUnicodeString(&CSDVersionString, + VerInfo.szCSDVersion, + sizeof(VerInfo.szCSDVersion)); + Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, + L"", + VersionConfigurationTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Indicate nothing is there */ + CSDVersionString.Length = 0; + } + /* NULL-terminate */ + CSDVersionString.Buffer[CSDVersionString.Length / sizeof(WCHAR)] = UNICODE_NULL; + + EndBuffer = VersionBuffer; + if ( /* VerInfo.wServicePackMajor != 0 && */ CSDVersionString.Length) + { + /* Print the version string */ + Status = RtlStringCbPrintfExW(VersionBuffer, + sizeof(VersionBuffer), + &EndBuffer, + NULL, + 0, + L": %wZ", + &CSDVersionString); + if (!NT_SUCCESS(Status)) + { + /* No version, NULL-terminate the string */ + *EndBuffer = UNICODE_NULL; + } } else { - len = wcslen(wszVersion); - } - - *buffer = wszVersion; - return len; + /* No version, NULL-terminate the string */ + *EndBuffer = UNICODE_NULL; + } + + if (InSafeMode) + { + /* String for Safe Mode */ + Status = RtlStringCchPrintfW(pwszzVersion, + cchDest, + L"ReactOS Version %S %S (NT %u.%u Build %u%s)\n", + KERNEL_VERSION_STR, + KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + SharedUserData->NtMajorVersion, + SharedUserData->NtMinorVersion, + (VerInfo.dwBuildNumber & 0xFFFF), + VersionBuffer); + + if (AppendNtSystemRoot && NT_SUCCESS(Status)) + { + Status = RtlStringCbPrintfW(VersionBuffer, + sizeof(VersionBuffer), + L" - %s\n", + SharedUserData->NtSystemRoot); + if (NT_SUCCESS(Status)) + { + /* Replace the last newline by a NULL, before concatenating */ + EndBuffer = wcsrchr(pwszzVersion, L'\n'); + if (EndBuffer) *EndBuffer = UNICODE_NULL; + + /* The concatenated string has a terminating newline */ + Status = RtlStringCchCatW(pwszzVersion, + cchDest, + VersionBuffer); + if (!NT_SUCCESS(Status)) + { + /* Concatenation failed, put back the newline */ + if (EndBuffer) *EndBuffer = L'\n'; + } + } + + /* Override any failures as the NtSystemRoot string is optional */ + Status = STATUS_SUCCESS; + } + } + else + { + /* Multi-string for Normal Mode */ + Status = RtlStringCchPrintfW(pwszzVersion, + cchDest, + L"ReactOS Version %S\n" + L"Build %S\n" + L"Reporting NT %u.%u (Build %u%s)\n", + KERNEL_VERSION_STR, + KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + SharedUserData->NtMajorVersion, + SharedUserData->NtMinorVersion, + (VerInfo.dwBuildNumber & 0xFFFF), + VersionBuffer); + + if (AppendNtSystemRoot && NT_SUCCESS(Status)) + { + Status = RtlStringCbPrintfW(VersionBuffer, + sizeof(VersionBuffer), + L"%s\n", + SharedUserData->NtSystemRoot); + if (NT_SUCCESS(Status)) + { + Status = RtlStringCchCatW(pwszzVersion, + cchDest, + VersionBuffer); + } + + /* Override any failures as the NtSystemRoot string is optional */ + Status = STATUS_SUCCESS; + } + } + + if (!NT_SUCCESS(Status)) + { + /* Fall-back string */ + Status = RtlStringCchPrintfW(pwszzVersion, + cchDest, + L"ReactOS Version %S %S\n", + KERNEL_VERSION_STR, + KERNEL_VERSION_BUILD_STR); + if (!NT_SUCCESS(Status)) + { + /* General failure, NULL-terminate the string */ + pwszzVersion[0] = UNICODE_NULL; + } + } + + /* + * Convert the string separators (newlines) into NULLs + * and NULL-terminate the multi-string. + */ + while (*pwszzVersion) + { + EndBuffer = wcschr(pwszzVersion, L'\n'); + if (!EndBuffer) break; + pwszzVersion = EndBuffer; + + *pwszzVersion++ = UNICODE_NULL; + } + *pwszzVersion = UNICODE_NULL; + + return Status; } @@ -1035,7 +1195,7 @@ return FALSE; /* Retrieve the current SafeMode state */ - InSafeMode = (UserGetSystemMetrics(SM_CLEANBOOT) != 0); + InSafeMode = (UserGetSystemMetrics(SM_CLEANBOOT) != 0); // gpsi->aiSysMet[SM_CLEANBOOT]; if (!InSafeMode) { @@ -1160,15 +1320,21 @@ /* * Display the system version on the desktop background */ - if (g_PaintDesktopVersion || InSafeMode) - { - PWSTR pwszVersion; + if (InSafeMode || g_AlwaysDisplayVersion || g_PaintDesktopVersion) + { + NTSTATUS Status; + static WCHAR wszzVersion[1024] = L"\0"; + + /* Only used in normal mode */ + // We expect at most 4 strings (3 for version, 1 for optional NtSystemRoot) + static POLYTEXTW VerStrs[4] = {{0},{0},{0},{0}}; + INT i = 0; INT len; - NONCLIENTMETRICSW ncm; - HFONT hFont = NULL, hOldFont = NULL; + + HFONT hFont1 = NULL, hFont2 = NULL, hOldFont = NULL; COLORREF crText, color_old; UINT align_old; - int mode_old; + INT mode_old; PDC pdc; if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &Rect, 0)) @@ -1177,18 +1343,22 @@ Rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); } - /* Set up the font (use default one otherwise) */ - ncm.cbSize = sizeof(ncm); - if (UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) - { - hFont = GreCreateFontIndirectW(&ncm.lfCaptionFont); - if (hFont) - hOldFont = NtGdiSelectFont(hDC, hFont); - } + /* + * Set up the fonts (otherwise use default ones) + */ + + /* Font for the principal version string */ + hFont1 = GreCreateFontIndirectW(&gspv.ncm.lfCaptionFont); + /* Font for the secondary version strings */ + hFont2 = GreCreateFontIndirectW(&gspv.ncm.lfMenuFont); + + if (hFont1) + hOldFont = NtGdiSelectFont(hDC, hFont1); if (gspv.hbmWallpaper == NULL) { /* Retrieve the brush fill colour */ + // TODO: The following code constitutes "GreGetBrushColor". PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); pdc = DC_LockDc(hDC); if (pdc) @@ -1219,33 +1389,100 @@ mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); /* Display the system version information */ - // FIXME: We need different strings for Safe Mode and regular mode. - len = GetSystemVersionString(&pwszVersion); // , InSafeMode); - if (len) + if (!*wszzVersion) + { + Status = GetSystemVersionString(wszzVersion, + ARRAYSIZE(wszzVersion), + InSafeMode, + g_AlwaysDisplayVersion); + if (!InSafeMode && NT_SUCCESS(Status) && *wszzVersion) + { + PWCHAR pstr = wszzVersion; + for (i = 0; (i < ARRAYSIZE(VerStrs)) && *pstr; ++i) + { + VerStrs[i].n = wcslen(pstr); + VerStrs[i].lpstr = pstr; + pstr += (VerStrs[i].n + 1); + } + } + } + else + { + Status = STATUS_SUCCESS; + } + if (NT_SUCCESS(Status) && *wszzVersion) { if (!InSafeMode) { - GreExtTextOutW(hDC, Rect.right - 16, Rect.bottom - 48, 0, NULL, pwszVersion, len, NULL, 0); + SIZE Size = {0, 0}; + LONG TotalHeight = 0; + + /* Normal Mode: multiple version information text separated by newlines */ + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BOTTOM); + + /* Compute the heights of the strings */ + if (hFont1) NtGdiSelectFont(hDC, hFont1); + for (i = 0; i < ARRAYSIZE(VerStrs); ++i) + { + if (!VerStrs[i].lpstr || !*VerStrs[i].lpstr || (VerStrs[i].n == 0)) + break; + + GreGetTextExtentW(hDC, VerStrs[i].lpstr, VerStrs[i].n, &Size, 1); + VerStrs[i].y = Size.cy; // Store the string height + TotalHeight += Size.cy; + + /* While the first string was using hFont1, all the others use hFont2 */ + if (hFont2) NtGdiSelectFont(hDC, hFont2); + } + /* The total height must not exceed the screen height */ + TotalHeight = min(TotalHeight, Rect.bottom); + + /* Display the strings */ + if (hFont1) NtGdiSelectFont(hDC, hFont1); + for (i = 0; i < ARRAYSIZE(VerStrs); ++i) + { + if (!VerStrs[i].lpstr || !*VerStrs[i].lpstr || (VerStrs[i].n == 0)) + break; + + TotalHeight -= VerStrs[i].y; + GreExtTextOutW(hDC, + Rect.right - 5, + Rect.bottom - TotalHeight - 5, + 0, NULL, + VerStrs[i].lpstr, + VerStrs[i].n, + NULL, 0); + + /* While the first string was using hFont1, all the others use hFont2 */ + if (hFont2) NtGdiSelectFont(hDC, hFont2); + } } else { - /* Safe Mode: version information text in top center */ + if (hFont1) NtGdiSelectFont(hDC, hFont1); + + /* Safe Mode: single version information text in top center */ + len = wcslen(wszzVersion); + IntGdiSetTextAlign(hDC, TA_CENTER | TA_TOP); - GreExtTextOutW(hDC, (Rect.right + Rect.left)/2, Rect.top + 3, 0, NULL, pwszVersion, len, NULL, 0); + GreExtTextOutW(hDC, (Rect.right + Rect.left)/2, Rect.top + 3, 0, NULL, wszzVersion, len, NULL, 0); } } if (InSafeMode) { + if (hFont1) NtGdiSelectFont(hDC, hFont1); + /* Print Safe Mode text in corners */ len = wcslen(s_wszSafeMode); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_TOP); GreExtTextOutW(hDC, Rect.left, Rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); IntGdiSetTextAlign(hDC, TA_RIGHT | TA_TOP); GreExtTextOutW(hDC, Rect.right, Rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_LEFT | TA_BASELINE); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_BOTTOM); GreExtTextOutW(hDC, Rect.left, Rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BASELINE); + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BOTTOM); GreExtTextOutW(hDC, Rect.right, Rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); } @@ -1253,10 +1490,13 @@ IntGdiSetTextAlign(hDC, align_old); IntGdiSetTextColor(hDC, color_old); - if (hFont) + if (hFont2) + GreDeleteObject(hFont2); + + if (hFont1) { NtGdiSelectFont(hDC, hOldFont); - GreDeleteObject(hFont); + GreDeleteObject(hFont1); } } Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Wed Jun 1 15:24:38 2016 @@ -14,6 +14,7 @@ PTHREADINFO gptiCurrent = NULL; PPROCESSINFO gppiInputProvider = NULL; +BOOL g_AlwaysDisplayVersion = FALSE; ERESOURCE UserLock; ATOM AtomMessage; // Window Message atom. ATOM AtomWndObj; // Window Object atom. @@ -76,6 +77,7 @@ InitUserImpl(VOID) { NTSTATUS Status; + HKEY hKey; ExInitializeResourceLite(&UserLock); @@ -93,6 +95,16 @@ } InitUserAtoms(); + + Status = RegOpenKey(L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows", + &hKey); + if (NT_SUCCESS(Status)) + { + DWORD dwValue = 0; + RegReadDWORD(hKey, L"DisplayVersion", &dwValue); + g_AlwaysDisplayVersion = !!dwValue; + ZwClose(hKey); + } InitSysParams(); Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Wed Jun 1 15:24:38 2016 @@ -14,6 +14,7 @@ extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; +extern BOOL g_AlwaysDisplayVersion; extern ATOM gaGuiConsoleWndClass; extern ATOM AtomDDETrack; extern ATOM AtomQOS;

1 0

[hbelusca] 71485: [BASESRV] - Always NULL-terminate the cached CSDVersion string. - Alex wrote most of this file! Attribute to him too.
by hbelusca＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: hbelusca Date: Wed Jun 1 13:22:33 2016 New Revision: 71485 URL: http://svn.reactos.org/svn/reactos?rev=71485&view=rev Log: [BASESRV] - Always NULL-terminate the cached CSDVersion string. - Alex wrote most of this file! Attribute to him too. Modified: trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Wed Jun 1 13:22:33 2016 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/init.c * PURPOSE: Initialization - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ @@ -440,9 +441,11 @@ } else { - /* NULL-terminate to indicate nothing is there */ - BaseStaticServerData->CSDVersion[0] = UNICODE_NULL; - } + /* Indicate nothing is there */ + BaseSrvCSDString.Length = 0; + } + /* NULL-terminate */ + BaseStaticServerData->CSDVersion[BaseSrvCSDString.Length / sizeof(WCHAR)] = UNICODE_NULL; /* Cache the system information */ Status = NtQuerySystemInformation(SystemBasicInformation,

1 0

[hbelusca] 71484: [WIN32K]: Avoid (LPWSTR) casts on strings that are LPCWSTR, by just using the corresponding const type LPCWSTR in the functions parameters.
by hbelusca＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: hbelusca Date: Wed Jun 1 13:20:18 2016 New Revision: 71484 URL: http://svn.reactos.org/svn/reactos?rev=71484&view=rev Log: [WIN32K]: Avoid (LPWSTR) casts on strings that are LPCWSTR, by just using the corresponding const type LPCWSTR in the functions parameters. Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/text.c trunk/reactos/win32ss/gdi/ntgdi/text.h trunk/reactos/win32ss/user/rtl/text.c Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -117,7 +117,7 @@ FASTCALL GreGetCharacterPlacementW( HDC hdc, - LPWSTR pwsz, + LPCWSTR pwsz, INT nCount, INT nMaxExtent, LPGCP_RESULTSW pgcpw, Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -3316,7 +3316,7 @@ IN INT YStart, IN UINT fuOptions, IN OPTIONAL PRECTL lprc, - IN LPWSTR String, + IN LPCWSTR String, IN INT Count, IN OPTIONAL LPINT Dx, IN DWORD dwCodePage) @@ -3885,7 +3885,7 @@ RECTL SafeRect; BYTE LocalBuffer[STACK_TEXT_BUFFER_SIZE]; PVOID Buffer = LocalBuffer; - LPWSTR SafeString = NULL; + LPCWSTR SafeString = NULL; LPINT SafeDx = NULL; ULONG BufSize, StringSize, DxSize = 0; @@ -3922,7 +3922,7 @@ _SEH2_TRY { /* Put the Dx before the String to assure alignment of 4 */ - SafeString = (LPWSTR)(((ULONG_PTR)Buffer) + DxSize); + SafeString = (LPCWSTR)(((ULONG_PTR)Buffer) + DxSize); /* Probe and copy the string */ ProbeForRead(UnsafeString, StringSize, 1); Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -23,7 +23,7 @@ LPCWSTR lpString, int cchString) { - return GreExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL, 0); + return GreExtTextOutW(hdc, nXStart, nYStart, 0, NULL, lpString, cchString, NULL, 0); } /* @@ -35,7 +35,7 @@ FASTCALL GreGetTextExtentW( HDC hDC, - LPWSTR lpwsz, + LPCWSTR lpwsz, INT cwc, LPSIZE psize, UINT flOpts) @@ -92,7 +92,7 @@ FASTCALL GreGetTextExtentExW( HDC hDC, - LPWSTR String, + LPCWSTR String, ULONG Count, ULONG MaxExtent, PULONG Fit, Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -126,10 +126,10 @@ BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL RECTL*, - IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); + IN LPCWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); DWORD FASTCALL IntGetCharDimensions(HDC, PTEXTMETRICW, PDWORD); -BOOL FASTCALL GreGetTextExtentW(HDC,LPWSTR,INT,LPSIZE,UINT); -BOOL FASTCALL GreGetTextExtentExW(HDC,LPWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); +BOOL FASTCALL GreGetTextExtentW(HDC,LPCWSTR,INT,LPSIZE,UINT); +BOOL FASTCALL GreGetTextExtentExW(HDC,LPCWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); BOOL FASTCALL GreTextOutW(HDC,int,int,LPCWSTR,int); HFONT FASTCALL GreCreateFontIndirectW( LOGFONTW * ); BOOL WINAPI GreGetTextMetricsW( _In_ HDC hdc, _Out_ LPTEXTMETRICW lptm); Modified: trunk/reactos/win32ss/user/rtl/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/rtl/text.c?re… ============================================================================== --- trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -120,7 +120,7 @@ if (lpstr[j] == '\t') break; /* get the extent of the normal character part */ #ifdef _WIN32K_ - GreGetTextExtentW( hdc, (LPWSTR)lpstr + i, j - i , &extent, 0 ); + GreGetTextExtentW( hdc, lpstr + i, j - i , &extent, 0 ); #else GetTextExtentPointW( hdc, lpstr + i, j - i , &extent ); #endif @@ -169,7 +169,7 @@ r.bottom = y + extent.cy; #ifdef _WIN32K_ GreExtTextOutW( hdc, x0, y, GreGetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, - &r, (LPWSTR)lpstr + i, j - i, NULL, 0 ); + &r, lpstr + i, j - i, NULL, 0 ); #else ExtTextOutW( hdc, x0, y, GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, &r, lpstr + i, j - i, NULL ); @@ -1029,13 +1029,13 @@ HPEN hpen; HPEN oldPen; #ifdef _WIN32K_ - GreGetTextExtentW (hdc, (LPWSTR)str, offset, &size, 0); + GreGetTextExtentW (hdc, str, offset, &size, 0); #else GetTextExtentPointW (hdc, str, offset, &size); #endif prefix_x = x + size.cx; #ifdef _WIN32K_ - GreGetTextExtentW (hdc, (LPWSTR)str, offset+1, &size, 0); + GreGetTextExtentW (hdc, str, offset+1, &size, 0); #else GetTextExtentPointW (hdc, str, offset+1, &size); #endif @@ -1276,7 +1276,7 @@ len_seg = p - str; if (len_seg != len && #ifdef _WIN32K_ - !GreGetTextExtentW(hdc, (LPWSTR)str, len_seg, &size, 0)) + !GreGetTextExtentW(hdc, str, len_seg, &size, 0)) #else !GetTextExtentPointW(hdc, str, len_seg, &size)) #endif @@ -1295,7 +1295,7 @@ if (!GreExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), - rect, (LPWSTR)str, len_seg, NULL, 0 )) + rect, str, len_seg, NULL, 0 )) #else if (!ExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) |

1 0

[cwittich] 71483: [MSI] silence DllRegisterServer MessageBoxes CORE-11244
by cwittich＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: cwittich Date: Wed Jun 1 09:12:22 2016 New Revision: 71483 URL: http://svn.reactos.org/svn/reactos?rev=71483&view=rev Log: [MSI] silence DllRegisterServer MessageBoxes CORE-11244 Modified: trunk/reactos/dll/win32/msi/action.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Wed Jun 1 09:12:22 2016 @@ -4769,10 +4769,17 @@ static void register_dll( const WCHAR *dll, BOOL unregister ) { +#ifdef __REACTOS_ + static const WCHAR regW[] = + {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','\"','%','s','\"',0}; + static const WCHAR unregW[] = + {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','/','u',' ','\"','%','s','\"',0}; +#else /* __REACTOS__ */ static const WCHAR regW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','\"','%','s','\"',0}; static const WCHAR unregW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','u',' ','\"','%','s','\"',0}; +#endif /* __REACTOS__ */ PROCESS_INFORMATION pi; STARTUPINFOW si; WCHAR *cmd;

1 0

[tfaber] 71482: [ACPICA] - Define ACPI_USE_SYSTEM_CLIBRARY to use our libc functions rather than acpica's own implementations. Fixes MSVC release build and obsoletes some ROS-diffs CORE-11184 #resolve
by tfaber＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: tfaber Date: Wed Jun 1 07:32:30 2016 New Revision: 71482 URL: http://svn.reactos.org/svn/reactos?rev=71482&view=rev Log: [ACPICA] - Define ACPI_USE_SYSTEM_CLIBRARY to use our libc functions rather than acpica's own implementations. Fixes MSVC release build and obsoletes some ROS-diffs CORE-11184 #resolve Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Wed Jun 1 07:32:30 2016 @@ -172,7 +172,7 @@ acpica/utilities/utglobal.c) add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) -set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") +set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE;ACPI_USE_SYSTEM_CLIBRARY") add_dependencies(acpica bugcodes xdk) list(APPEND ACPI_SOURCE @@ -193,7 +193,7 @@ add_library(acpi SHARED ${ACPI_SOURCE}) set_module_type(acpi kernelmodedriver) -target_link_libraries(acpi wdmguid acpica ${PSEH_LIB}) +target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB}) add_importlibs(acpi ntoskrnl hal) add_pch(acpi precomp.h ACPI_SOURCE) add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h [iso-8859-1] Wed Jun 1 07:32:30 2016 @@ -118,17 +118,10 @@ const char *SrcString, ACPI_SIZE Count); -#ifdef __REACTOS__ -char * -strstr ( - const char *String1, - const char *String2); -#else /* __REACTOS__ */ char * strstr ( char *String1, char *String2); -#endif /* __REACTOS__ */ /* Conversion */ @@ -142,19 +135,11 @@ /* Memory */ -#ifdef __REACTOS__ -int -memcmp ( - const void *Buffer1, - const void *Buffer2, - ACPI_SIZE Count); -#else /* __REACTOS__ */ int memcmp ( void *Buffer1, void *Buffer2, ACPI_SIZE Count); -#endif /* __REACTOS__ */ void * memcpy ( Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c [iso-8859-1] Wed Jun 1 07:32:30 2016 @@ -107,19 +107,11 @@ * DESCRIPTION: Compare two Buffers, with a maximum length * ******************************************************************************/ -#ifdef __REACTOS__ -int -memcmp ( - const void *VBuffer1, - const void *VBuffer2, - ACPI_SIZE Count) -#else /* __REACTOS__ */ int memcmp ( void *VBuffer1, void *VBuffer2, ACPI_SIZE Count) -#endif /* __REACTOS__ */ { char *Buffer1 = (char *) VBuffer1; char *Buffer2 = (char *) VBuffer2; @@ -514,17 +506,10 @@ * ******************************************************************************/ -#ifdef __REACTOS__ -char * -strstr ( - const char *String1, - const char *String2) -#else /* __REACTOS **/ char * strstr ( char *String1, char *String2) -#endif /* __REACTOS__ */ { UINT32 Length; @@ -532,22 +517,14 @@ Length = strlen (String2); if (!Length) { -#ifdef __REACTOS__ - return (char *)(String1); -#else /* __REACTOS__ */ return (String1); -#endif /* __REACTOS__ */ } while (strlen (String1) >= Length) { if (memcmp (String1, String2, Length) == 0) { -#ifdef __REACTOS__ - return (char *)(String1); -#else /* __REACTOS__ */ return (String1); -#endif /* __REACTOS__ */ } String1++; }

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