Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[dquintana] 62131: [RSHELL] * Implement CMenuSite CORE-7879

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Feb 12 16:35:29 2014 New Revision: 62131 URL: http://svn.reactos.org/svn/reactos?rev=62131&view=rev Log: [RSHELL] * Implement CMenuSite CORE-7879 Added: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp (with props) Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/precomp.h Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Wed Feb 12 16:35:29 2014 @@ -9,6 +9,7 @@ list(APPEND SOURCE CDesktopBrowser.cpp CStartMenu.cpp + CMenuSite.cpp misc.cpp ${CMAKE_CURRENT_BINARY_DIR}/rshell.def) Added: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp (added) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Wed Feb 12 16:35:29 2014 @@ -0,0 +1,498 @@ +/* + * Shell Menu Site + * + * Copyright 2014 David Quintana + * + * 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 + */ + +#include "precomp.h" +#include <atlwin.h> +#include <shlwapi_undoc.h> + +WINE_DEFAULT_DEBUG_CHANNEL(menusite); + +bool _assert(bool cond, LPCSTR expr, LPCSTR file, DWORD line, LPCSTR func) +{ +#if DBG + if (!cond) + { + wine_dbg_printf("%s(%d): Assertion failed '%s', at %s", file, line, expr, func); + DebugBreak(); + } +#endif + return cond; +} +#define DBGASSERT(x) _assert(!!(x), #x, __FILE__, __LINE__, __FUNCSIG__) + +class CMenuSite : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CWindowImpl<CMenuSite, CWindow, CControlWinTraits>, + public IBandSite, + public IDeskBarClient, + public IOleCommandTarget, + public IInputObject, + public IInputObjectSite, + public IWinEventHandler, + public IServiceProvider +{ + IUnknown * m_DeskBarSite; + IUnknown * m_BandObject; + IDeskBand * m_DeskBand; + IWinEventHandler * m_WinEventHandler; + HWND m_hWndBand; + +public: + CMenuSite(); + ~CMenuSite() {} + + DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_WINDOW) + + DECLARE_NOT_AGGREGATABLE(CMenuSite) + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CMenuSite) + COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) + COM_INTERFACE_ENTRY_IID(IID_IDeskBarClient, IDeskBarClient) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + END_COM_MAP() + + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus); + virtual HRESULT STDMETHODCALLTYPE AddBand(IUnknown * punk); + virtual HRESULT STDMETHODCALLTYPE EnumBands(UINT uBand, DWORD* pdwBandID); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT STDMETHODCALLTYPE GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv); + virtual HRESULT STDMETHODCALLTYPE GetSize(DWORD dwWhich, LPRECT prc); + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); + virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName); + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE SetDeskBarSite(IUnknown *punkSite); + virtual HRESULT STDMETHODCALLTYPE UIActivateDBC(DWORD dwState); + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + + // Using custom message map instead + virtual BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD mapId = 0); + + // UNIMPLEMENTED + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + virtual HRESULT STDMETHODCALLTYPE GetBandSiteInfo(BANDSITEINFO *pbsinfo); + virtual HRESULT STDMETHODCALLTYPE RemoveBand(DWORD dwBandID); + virtual HRESULT STDMETHODCALLTYPE SetBandSiteInfo(const BANDSITEINFO *pbsinfo); + virtual HRESULT STDMETHODCALLTYPE SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState); + virtual HRESULT STDMETHODCALLTYPE SetModeDBC(DWORD dwMode); + +private: + BOOL CreateSiteWindow(HWND hWndParent); +}; + +extern "C" +HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + + CMenuSite * site = new CComObject<CMenuSite>(); + + if (!site) + return E_OUTOFMEMORY; + + HRESULT hr = site->QueryInterface(riid, ppv); + + if (FAILED(hr)) + site->Release(); + + return hr; +} + +CMenuSite::CMenuSite() : + m_DeskBarSite(NULL), + m_BandObject(NULL), + m_DeskBand(NULL), + m_WinEventHandler(NULL), + m_hWndBand(NULL) +{ +} + +HRESULT STDMETHODCALLTYPE CMenuSite::ContextSensitiveHelp(BOOL fEnterMode) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::GetBandSiteInfo(BANDSITEINFO *pbsinfo) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::RemoveBand(DWORD dwBandID) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::SetModeDBC(DWORD dwMode) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::TranslateAcceleratorIO(LPMSG lpMsg) +{ + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::HasFocusIO() +{ + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::AddBand(IUnknown * punk) +{ + if (SHIsSameObject(punk, m_BandObject)) + return S_OK + 0; + + IUnknown_SetSite(m_BandObject, NULL); + + if (m_BandObject) + { + m_BandObject->Release(); + m_BandObject = NULL; + } + + if (m_DeskBand) + { + m_DeskBand->Release(); + m_DeskBand = NULL; + } + + if (m_WinEventHandler) + { + m_WinEventHandler->Release(); + m_WinEventHandler = NULL; + } + + BOOL result = m_hWndBand != NULL; + + m_hWndBand = NULL; + + if (!punk) + return result ? S_OK + 0 : E_FAIL; + + DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)))); + DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)))); + + IUnknown_SetSite(punk, (IDeskBarClient*)this); + IUnknown_GetWindow(punk, &m_hWndBand); + + m_BandObject = punk; + + punk->AddRef(); + + return S_OK + 0; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::EnumBands(UINT uBand, DWORD* pdwBandID) +{ + if (uBand != 0) + return E_FAIL; + + *pdwBandID = 0; + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + return IUnknown_Exec(m_DeskBarSite, *pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) +{ + if (!DBGASSERT(dwBandID == 0) || m_BandObject == NULL) + { + *ppv = NULL; + return E_NOINTERFACE; + } + + return m_BandObject->QueryInterface(riid, ppv); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::GetSize(DWORD dwWhich, LPRECT prc) +{ + memset(prc, 0, sizeof(*prc)); + + if (dwWhich != 0) + return S_OK; + + if (m_DeskBand == NULL) + return S_OK; + + DESKBANDINFO info = { 0 }; + + m_DeskBand->GetBandInfo(0, 0, &info); + + prc->right = info.ptMaxSize.x; + prc->bottom = info.ptMaxSize.y; + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::GetWindow(HWND *phwnd) +{ + DBGASSERT(IsWindow()); + + *phwnd = m_hWnd; + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::IsWindowOwner(HWND hWnd) +{ + if (hWnd == m_hWnd) + return S_OK; + + if (!m_WinEventHandler) + return S_FALSE; + + return m_WinEventHandler->IsWindowOwner(hWnd); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + if (!m_WinEventHandler) + return S_OK; + + return m_WinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) +{ + DBGASSERT(dwBandID == 0); + DBGASSERT(!IsBadWritePtr(ppstb, sizeof(*ppstb))); + + if (!m_BandObject) + { + *ppstb = NULL; + return E_NOINTERFACE; + } + + HRESULT hr = m_BandObject->QueryInterface(IID_PPV_ARG(IDeskBand, ppstb)); + + *pdwState = 1; + + if (cchName > 0) + pszName[0] = 0; + + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualGUID(guidService, SID_SMenuBandBottom) || + IsEqualGUID(guidService, SID_SMenuBandBottomSelected) || + IsEqualGUID(guidService, SID_SMenuBandChild)) + { + if (m_BandObject == NULL) + return E_FAIL; + + return IUnknown_QueryService(m_BandObject, guidService, riid, ppvObject); + } + + DBGASSERT(m_DeskBarSite); + + return IUnknown_QueryService(m_DeskBarSite, guidService, riid, ppvObject); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + if (!DBGASSERT(m_DeskBarSite)) + return E_FAIL; + return IUnknown_QueryStatus(m_DeskBarSite, *pguidCmdGroup, cCmds, prgCmds, pCmdText); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::SetDeskBarSite(IUnknown *punkSite) +{ + HWND hWndSite; + + ((IDeskBarClient*)this)->AddRef(); + + if (punkSite) + { + if (m_DeskBarSite) + { + m_DeskBarSite->Release(); + m_DeskBarSite = NULL; + } + + IUnknown_GetWindow(punkSite, &hWndSite); + + if (hWndSite) + { + CreateSiteWindow(hWndSite); + + m_DeskBarSite = punkSite; + + punkSite->AddRef(); + } + } + else + { + if (m_DeskBand) + { + m_DeskBand->CloseDW(0); + } + + IUnknown_SetSite(m_BandObject, NULL); + + if (m_BandObject) + { + m_BandObject->Release(); + m_BandObject = NULL; + } + + if (m_DeskBand) + { + m_DeskBand->Release(); + m_DeskBand = NULL; + } + + if (m_WinEventHandler) + { + m_WinEventHandler->Release(); + m_WinEventHandler = NULL; + } + + m_hWndBand = NULL; + + if (m_hWnd) + { + DestroyWindow(); + m_hWnd = NULL; + } + + if (m_DeskBarSite) + m_DeskBarSite->Release(); + + m_DeskBarSite = NULL; + } + + ((IDeskBarClient*)this)->Release(); + + if (!m_hWnd) + return E_FAIL; + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateDBC(DWORD dwState) +{ + if (!DBGASSERT(m_DeskBand)) + return S_OK; + + return m_DeskBand->ShowDW(dwState != 0); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + if (lpMsg && DBGASSERT(IsBadWritePtr(lpMsg, sizeof(*lpMsg)))) + return E_FAIL; + + return IUnknown_UIActivateIO(m_BandObject, fActivate, lpMsg); +} + +BOOL CMenuSite::CreateSiteWindow(HWND hWndParent) +{ + if (m_hWnd) + { + return DBGASSERT(IsWindow()); + } + + Create(hWndParent, NULL, L"MenuSite"); + + return m_hWnd != NULL; +} + +BOOL CMenuSite::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD mapId) +{ + HWND hWndToCall; + IMenuPopup * pMenuPopup; + + ((IDeskBarClient*)this)->AddRef(); + + switch (uMsg) + { + case WM_SIZE: + if (m_BandObject) + { + if (SUCCEEDED(m_BandObject->QueryInterface(IID_PPV_ARG(IMenuPopup, &pMenuPopup)))) + { + RECT Rect = { 0 }; + GetClientRect(&Rect); + pMenuPopup->OnPosRectChangeDB(&Rect); + pMenuPopup->Release(); + } + } + hWndToCall = hWnd; + lResult = 1; + break; + case WM_NOTIFY: + hWndToCall = *(HWND *) lParam; + break; + case WM_COMMAND: + hWndToCall = (HWND) lParam; + break; + default: + ((IDeskBarClient*)this)->Release(); + return FALSE; + } + + if (hWndToCall) + { + if (m_WinEventHandler) + { + if (m_WinEventHandler->IsWindowOwner(hWndToCall) == S_OK) + { + HRESULT hr = m_WinEventHandler->OnWinEvent(hWndToCall, uMsg, wParam, lParam, &lResult); + ((IDeskBarClient*)this)->Release(); + return hr == S_OK; + } + } + } + + ((IDeskBarClient*)this)->Release(); + return FALSE; +} Propchange: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Feb 12 16:35:29 2014 @@ -266,7 +266,7 @@ if (FAILED(hr)) return NULL; -#if 1 +#if 0 hr = CoCreateInstance(CLSID_MenuBandSite, NULL, CLSCTX_INPROC_SERVER, Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Wed Feb 12 16:35:29 2014 @@ -29,3 +29,5 @@ #define shell32_hInstance 0 #define SMC_EXEC 4 extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); + +extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv);

10 years, 10 months

[akhaldi] 62130: [USETUP] * Prepare the CMake script for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 13:50:38 2014 New Revision: 62130 URL: http://svn.reactos.org/svn/reactos?rev=62130&view=rev Log: [USETUP] * Prepare the CMake script for PCH. CORE-7716 Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Wed Feb 12 13:50:38 2014 @@ -6,7 +6,7 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/include/reactos/drivers) -add_executable(usetup +list(APPEND SOURCE interface/usetup.c interface/devinst.c interface/consup.c @@ -30,7 +30,9 @@ progress.c registry.c settings.c - usetup.rc) + usetup.h) + +add_executable(usetup ${SOURCE} usetup.rc) target_link_libraries(usetup zlib @@ -40,5 +42,5 @@ set_module_type(usetup nativecui) add_importlibs(usetup ntdll) -add_pch(usetup usetup.h) +add_pch(usetup usetup.h SOURCE) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)

10 years, 10 months

[akhaldi] 62129: [STLPORT] * Prepare the CMake script for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 11:56:30 2014 New Revision: 62129 URL: http://svn.reactos.org/svn/reactos?rev=62129&view=rev Log: [STLPORT] * Prepare the CMake script for PCH. CORE-7716 Modified: trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt trunk/reactos/lib/3rdparty/stlport/src/dll_main.cpp Modified: trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Wed Feb 12 11:56:30 2014 @@ -40,7 +40,11 @@ src/string.cpp src/strstream.cpp src/time_facets.cpp - src/c_locale.c - src/cxa.c) + src/stlport_prefix.h) -add_library(stlport ${SOURCE}) +add_library(stlport + ${SOURCE} + src/cxa.c + src/c_locale.c) + +add_pch(stlport src/stlport_prefix.h SOURCE) Modified: trunk/reactos/lib/3rdparty/stlport/src/dll_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/src/d… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/src/dll_main.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/src/dll_main.cpp [iso-8859-1] Wed Feb 12 11:56:30 2014 @@ -22,8 +22,6 @@ * modified is included with the above copyright notice. * */ - -#define _STLP_EXPOSE_GLOBALS_IMPLEMENTATION #include "stlport_prefix.h"

10 years, 10 months

[akhaldi] 62128: [FREELDR][SETUPLDR] * Prepare the CMake script for PCH. * Add header guards to pcbios.h. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 11:37:40 2014 New Revision: 62128 URL: http://svn.reactos.org/svn/reactos?rev=62128&view=rev Log: [FREELDR][SETUPLDR] * Prepare the CMake script for PCH. * Add header guards to pcbios.h. CORE-7716 Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Feb 12 11:37:40 2014 @@ -32,6 +32,7 @@ endif() list(APPEND FREELDR_COMMON_SOURCE + include/freeldr.h cmdline.c debug.c linuxboot.c @@ -121,7 +122,7 @@ windows/headless.c disk/scsiport.c) if(NOT MSVC) - list(APPEND FREELDR_COMMON_SOURCE arch/i386/drvmap.S) + list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/drvmap.S) endif() elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_ASM_SOURCE @@ -152,12 +153,9 @@ #TBD endif() -if(NOT MSVC) - add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE} ${FREELDR_COMMON_ASM_SOURCE}) -else() - add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) - add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm}) -endif() +add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) +add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm}) +add_pch(freeldr_common include/freeldr.h FREELDR_COMMON_SOURCE) add_dependencies(freeldr_common bugcodes) if(ARCH STREQUAL "i386" AND NOT MSVC) @@ -173,24 +171,20 @@ list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) endif() -if(NOT MSVC) - add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) - add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) - if(SEPARATE_DBG) - set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) - set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) - endif() +add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) +add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) + +if(NOT MSVC AND SEPARATE_DBG) + set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) +endif() + +if(MSVC) + add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text ") + add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") else() - add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) - add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) -endif() - -if(NOT MSVC) add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") -else() - add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text ") - add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") endif() set_image_base(freeldr_pe 0x10000) @@ -206,15 +200,8 @@ target_link_libraries(freeldr_pe_dbg mini_hal) endif() -if(MSVC) - target_link_libraries(freeldr_pe freeldr_common) - target_link_libraries(freeldr_pe_dbg freeldr_common) -endif() - -target_link_libraries(freeldr_pe cportlib cmlib rtl libcntpr) -target_link_libraries(freeldr_pe_dbg cportlib cmlib rtl libcntpr) - -# add_pch(freeldr_pe include/freeldr.h) +target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr) +target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe_dbg asm) @@ -237,24 +224,20 @@ list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() -if(NOT MSVC) - add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) - add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) - if(SEPARATE_DBG) - set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) - set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) - endif() +add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + +if(NOT MSVC AND SEPARATE_DBG) + set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) +endif() + +if(MSVC) + add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") + add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") else() - add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) - add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) -endif() - -if(NOT MSVC) add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") add_target_link_flags(setupldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") -else() - add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") - add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") endif() add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP) @@ -273,13 +256,8 @@ target_link_libraries(setupldr_pe_dbg mini_hal) endif() -if(MSVC) - target_link_libraries(setupldr_pe freeldr_common) - target_link_libraries(setupldr_pe_dbg freeldr_common) -endif() - -target_link_libraries(setupldr_pe cportlib cmlib rtl libcntpr) -target_link_libraries(setupldr_pe_dbg cportlib cmlib rtl libcntpr) +target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr) +target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) add_dependencies(setupldr_pe asm) add_dependencies(setupldr_pe_dbg asm) Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] Wed Feb 12 11:37:40 2014 @@ -1,3 +1,6 @@ +#ifndef _PCBIOS_H_ +#define _PCBIOS_H_ + #ifndef __ASM__ typedef enum @@ -139,3 +142,4 @@ #define REGS_EFLAGS 36 #define REGS_SIZE 40 +#endif /* _PCBIOS_H_ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Feb 12 11:37:40 2014 @@ -122,4 +122,4 @@ VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem); VOID RunLoader(VOID); -#endif // defined __FREELDR_H +#endif /* __FREELDR_H */

10 years, 10 months

[akhaldi] 62127: [CMD][EXPLORER][EXPLORER_NEW] * Prepare the CMake scripts for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 11:00:35 2014 New Revision: 62127 URL: http://svn.reactos.org/svn/reactos?rev=62127&view=rev Log: [CMD][EXPLORER][EXPLORER_NEW] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/explorer-new/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Wed Feb 12 11:00:35 2014 @@ -65,11 +65,11 @@ vol.c where.c window.c - cmd.rc) + precomp.h) -add_executable(cmd ${SOURCE}) +add_executable(cmd ${SOURCE} cmd.rc) target_link_libraries(cmd wine) set_module_type(cmd win32cui UNICODE) add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) -add_pch(cmd precomp.h) +add_pch(cmd precomp.h SOURCE) add_cd_file(TARGET cmd DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… ============================================================================== --- trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Wed Feb 12 11:00:35 2014 @@ -14,9 +14,9 @@ trayntfy.c trayprop.c traywnd.c - explorer.rc) + precomp.h) -add_executable(explorer_new ${SOURCE}) +add_executable(explorer_new ${SOURCE} explorer.rc) target_link_libraries(explorer_new uuid) set_module_type(explorer_new win32gui UNICODE) add_importlibs(explorer_new @@ -34,5 +34,5 @@ msvcrt kernel32 ntdll) -add_pch(explorer_new precomp.h) +add_pch(explorer_new precomp.h SOURCE) add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Wed Feb 12 11:00:35 2014 @@ -7,7 +7,6 @@ -DWIN32 -D__WINDRES__) -#add_pch(explorer precomp.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND SOURCE @@ -31,9 +30,6 @@ taskbar/desktopbar.cpp taskbar/startmenu.cpp taskbar/traynotify.cpp - precomp.cpp - explorer.rc - services/startup.c services/shellservices.cpp desktop/desktop.cpp explorer.cpp @@ -43,18 +39,24 @@ utility/utility.cpp utility/xmlstorage.cpp utility/window.cpp - utility/shellbrowserimpl.cpp) # utility/shelltests.cpp + utility/shellbrowserimpl.cpp + precomp.h) # utility/shelltests.cpp if(ARCH STREQUAL "i386") - list(APPEND SOURCE - i386-stub-win32.c) + list(APPEND I386_SOURCE i386-stub-win32.c) endif() -add_executable(explorer ${SOURCE}) +add_executable(explorer + ${SOURCE} + ${I386_SOURCE} + services/startup.c + explorer.rc) + target_link_libraries(explorer comsupp wine uuid) set_module_type(explorer win32gui UNICODE) add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll) +add_pch(explorer precomp.h SOURCE) add_dependencies(explorer psdk) add_cd_file(TARGET explorer DESTINATION reactos FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all)

10 years, 10 months

[akhaldi] 62126: [NTDLL] * Prepare the CMake script for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 10:36:53 2014 New Revision: 62126 URL: http://svn.reactos.org/svn/reactos?rev=62126&view=rev Log: [NTDLL] * Prepare the CMake script for PCH. CORE-7716 Modified: trunk/reactos/dll/ntdll/CMakeLists.txt Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Wed Feb 12 10:36:53 2014 @@ -22,8 +22,7 @@ ldr/ldrutils.c rtl/libsupp.c rtl/version.c - def/ntdll.rc - ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) + include/ntdll.h) if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE dispatch/i386/dispatch.S) @@ -36,7 +35,12 @@ endif() add_asm_files(ntdll_asm ${ASM_SOURCE}) -add_library(ntdll SHARED ${SOURCE} ${ntdll_asm}) + +add_library(ntdll SHARED + ${SOURCE} + ${ntdll_asm} + def/ntdll.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) set_module_type(ntdll win32dll ENTRYPOINT 0) ############################################# @@ -55,7 +59,7 @@ uuid ${PSEH_LIB}) -add_pch(ntdll include/ntdll.h) +add_pch(ntdll include/ntdll.h SOURCE) add_dependencies(ntdll ntstatus asm) add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all)

10 years, 10 months

[akhaldi] 62125: [LIBMPG123] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 11 23:00:38 2014 New Revision: 62125 URL: http://svn.reactos.org/svn/reactos?rev=62125&view=rev Log: [LIBMPG123] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. CORE-7716 Added: trunk/reactos/lib/3rdparty/libmpg123/precomp.h (with props) Modified: trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/CMa… ============================================================================== --- trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Tue Feb 11 23:00:38 2014 @@ -13,7 +13,7 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) -add_library(libmpg123 +list(APPEND SOURCE compat.c dct64.c dct64_i386.c @@ -38,7 +38,10 @@ synth_8bit.c synth_real.c synth_s32.c - tabinit.c) + tabinit.c + precomp.h) +add_library(libmpg123 ${SOURCE}) add_dependencies(libmpg123 psdk) +add_pch(libmpg123 precomp.h SOURCE) allow_warnings(libmpg123) Added: trunk/reactos/lib/3rdparty/libmpg123/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/pre… ============================================================================== --- trunk/reactos/lib/3rdparty/libmpg123/precomp.h (added) +++ trunk/reactos/lib/3rdparty/libmpg123/precomp.h [iso-8859-1] Tue Feb 11 23:00:38 2014 @@ -0,0 +1,6 @@ +#ifndef _LIBMPG123_PCH_ +#define _LIBMPG123_PCH_ + +#include <mpg123lib_intern.h> + +#endif /* _LIBMPG123_PCH_ */ Propchange: trunk/reactos/lib/3rdparty/libmpg123/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 10 months

[akhaldi] 62124: [CMIPCI] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 11 22:35:09 2014 New Revision: 62124 URL: http://svn.reactos.org/svn/reactos?rev=62124&view=rev Log: [CMIPCI] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/guid.cpp (with props) trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/precomp.h (with props) Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] Tue Feb 11 22:35:09 2014 @@ -12,13 +12,15 @@ adapter.cpp common.cpp mintopo.cpp - minwave.cpp) + minwave.cpp + precomp.h) add_library(cmipci SHARED ${SOURCE} + guid.cpp cmipci.rc) -target_link_libraries(cmipci stdunk libcntpr) +target_link_libraries(cmipci stdunk libcntpr uuid) set_module_type(cmipci wdmdriver UNICODE) @@ -31,6 +33,7 @@ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-write-strings -Wno-switch -Wno-error") endif() +add_pch(cmipci precomp.h SOURCE) add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) if(ARCH STREQUAL "i386") add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x32.inf" DESTINATION reactos/inf FOR all) Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/guid.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/guid.cpp (added) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/guid.cpp [iso-8859-1] Tue Feb 11 22:35:09 2014 @@ -0,0 +1,9 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <ks.h> +#include <punknown.h> +#include <initguid.h> +#include "interfaces.hpp" + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/guid.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/precomp.h (added) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/precomp.h [iso-8859-1] Tue Feb 11 22:35:09 2014 @@ -0,0 +1,9 @@ +#ifndef _CMIDRIVER_PCH_ +#define _CMIDRIVER_PCH_ + +#include <wdm.h> +#include <portcls.h> + +#include "debug.hpp" + +#endif /* _CMIDRIVER_PCH_ */ Propchange: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 10 months

[akhaldi] 62123: [FTUSB] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 11 22:03:16 2014 New Revision: 62123 URL: http://svn.reactos.org/svn/reactos?rev=62123&view=rev Log: [FTUSB] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. CORE-7716 Added: trunk/reactos/drivers/bluetooth/fbtusb/precomp.h (with props) Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/C… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Tue Feb 11 22:03:16 2014 @@ -7,7 +7,8 @@ fbtpwr.c fbtrwr.c # fbtwmi.c - fbtusb.c) + fbtusb.c + precomp.h) add_library(fbtusb SHARED ${SOURCE} fbtusb.rc) @@ -19,4 +20,5 @@ set_module_type(fbtusb kernelmodedriver) add_importlibs(fbtusb ntoskrnl hal usbd) +add_pch(fbtusb precomp.h SOURCE) add_cd_file(TARGET fbtusb DESTINATION reactos/system32/drivers FOR all) Added: trunk/reactos/drivers/bluetooth/fbtusb/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/p… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/precomp.h (added) +++ trunk/reactos/drivers/bluetooth/fbtusb/precomp.h [iso-8859-1] Tue Feb 11 22:03:16 2014 @@ -0,0 +1,14 @@ +#ifndef _FBTUSB_PCH_ +#define _FBTUSB_PCH_ + +#include <stdio.h> + +#include "fbtusb.h" +#include "fbtpnp.h" +#include "fbtpwr.h" +#include "fbtdev.h" +#include "fbtwmi.h" +#include "fbtrwr.h" +#include "fbtusr.h" + +#endif /* _FBTUSB_PCH_ */ Propchange: trunk/reactos/drivers/bluetooth/fbtusb/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 10 months

[akhaldi] 62122: [LWIP] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 11 21:36:39 2014 New Revision: 62122 URL: http://svn.reactos.org/svn/reactos?rev=62122&view=rev Log: [LWIP] * Introduce a PCH suitable for use without altering the 3rd party code. * Prepare the CMake scripts for PCH. CORE-7716 Added: trunk/reactos/lib/drivers/lwip/precomp.h (with props) Modified: trunk/reactos/lib/drivers/lwip/CMakeLists.txt Modified: trunk/reactos/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CMakeList… ============================================================================== --- trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] Tue Feb 11 21:36:39 2014 @@ -54,10 +54,12 @@ src/core/snmp/mib_structs.c src/core/snmp/mib2.c src/core/snmp/msg_in.c - src/core/snmp/msg_out.c) + src/core/snmp/msg_out.c + precomp.h) add_library(lwip ${SOURCE}) add_dependencies(lwip bugcodes) +add_pch(lwip precomp.h SOURCE) if(NOT MSVC) allow_warnings(lwip) if(LTCG) Added: trunk/reactos/lib/drivers/lwip/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/precomp.h… ============================================================================== --- trunk/reactos/lib/drivers/lwip/precomp.h (added) +++ trunk/reactos/lib/drivers/lwip/precomp.h [iso-8859-1] Tue Feb 11 21:36:39 2014 @@ -0,0 +1,6 @@ +#ifndef _LWIP_PCH_ +#define _LWIP_PCH_ + +#include "src/include/lwip/opt.h" + +#endif /* _LWIP_PCH_ */ Propchange: trunk/reactos/lib/drivers/lwip/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 10 months

← Newer
1
...
21
22
23
24
25
26
27
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014