Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61981: [VGA] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: akhaldi Date: Tue Feb 4 17:01:57 2014 New Revision: 61981 URL: http://svn.reactos.org/svn/reactos?rev=61981&view=rev Log: [VGA] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -6,6 +6,7 @@ * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation */ +#pragma once //-------------------------------------------------------------------------- // Definition of the set/clear mode command language. Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -896,4 +896,3 @@ VgaInterpretCmdStream(HwDeviceExtension, DisableA000Color); } - Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -6,6 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ +#pragma once #define LOWORD(l) ((USHORT)((ULONG_PTR)(l))) #define HIWORD(l) ((USHORT)(((ULONG_PTR)(l)>>16)&0xFFFF)) Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -10,6 +10,8 @@ //--------------------------------------------------------------------------- #include "vga.h" + +#include <devioctl.h> //--------------------------------------------------------------------------- // Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -7,12 +7,11 @@ * ReactOS Portable Systems Group */ -#include "ntdef.h" -#include "dderror.h" -#include "devioctl.h" -#include "miniport.h" -#include "ntddvdeo.h" -#include "video.h" +#include <ntdef.h> +#include <dderror.h> +#include <miniport.h> +#include <video.h> + #include "cmdcnst.h" //

1 0

[akhaldi] 61980: [VGAMP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: akhaldi Date: Tue Feb 4 16:46:41 2014 New Revision: 61980 URL: http://svn.reactos.org/svn/reactos?rev=61980&view=rev Log: [VGAMP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/drivers/miniport/vga/initvga.c trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h Modified: trunk/reactos/win32ss/drivers/miniport/vga/initvga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -1,4 +1,6 @@ #include "vgamp.h" + +#include "vgavideo.h" static VGA_REGISTERS Mode12Regs = { Modified: trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -6,6 +6,9 @@ // ------------------------------------------------------- Includes #include "vgamp.h" + +#include <dderror.h> +#include <devioctl.h> // ------------------------------------------------------- Public Interface Modified: trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -23,13 +23,9 @@ /* INCLUDES *******************************************************************/ -#include "ntdef.h" -#include "dderror.h" -#include "devioctl.h" -#include "miniport.h" -#include "ntddvdeo.h" -#include "video.h" -#include "vgavideo.h" +#include <ntdef.h> +#include <miniport.h> +#include <video.h> #define UNIMPLEMENTED \ VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); Modified: trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -1,3 +1,4 @@ +#pragma once #define VGA_NORMAL 0 #define VGA_AND 8

1 0

[gadamopoulos] 61979: [rshell.dll] -cleanup the header from the remnants of my countless hacks that I tried with this module
by gadamopoulos＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: gadamopoulos Date: Tue Feb 4 12:14:14 2014 New Revision: 61979 URL: http://svn.reactos.org/svn/reactos?rev=61979&view=rev Log: [rshell.dll] -cleanup the header from the remnants of my countless hacks that I tried with this module Modified: branches/shell-experiments/base/shell/rshell/precomp.h 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] Tue Feb 4 12:14:14 2014 @@ -29,27 +29,3 @@ #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, void **ppv); - -#define INTERFACE IExplorerHostCreator -DECLARE_INTERFACE_(IExplorerHostCreator,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - /*** IExplorerHostCreator ***/ - STDMETHOD_(HRESULT,CreateHost)(/*THIS,*/ const GUID* guid) PURE; - STDMETHOD_(HRESULT,RunHost)(THIS) PURE; -}; -#undef INTERFACE - -#if defined(COBJMACROS) -/*** IUnknown methods ***/ -#define IExplorerHostCreator_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IExplorerHostCreator_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IExplorerHostCreator_Release(p) (p)->lpVtbl->Release(p) -/*** IExplorerHostCreator methods ***/ -#define IExplorerHostCreator_CreateHost(p,a) (p)->lpVtbl->CreateHost(p,a) -#define IExplorerHostCreator_RunHost(p) (p)->lpVtbl->RunHost(p) -#endif

1 0

[gadamopoulos] 61978: [rshell] - Commit rshell.exe that allows explorer_new to run in windows 8
by gadamopoulos＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: gadamopoulos Date: Tue Feb 4 12:11:51 2014 New Revision: 61978 URL: http://svn.reactos.org/svn/reactos?rev=61978&view=rev Log: [rshell] - Commit rshell.exe that allows explorer_new to run in windows 8 Added: branches/shell-experiments/base/shell/rshell/ (with props) branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp - copied, changed from r61883, trunk/reactos/dll/win32/shell32/desktop.cpp branches/shell-experiments/base/shell/rshell/CMakeLists.txt (with props) branches/shell-experiments/base/shell/rshell/CStartMenu.cpp (with props) branches/shell-experiments/base/shell/rshell/misc.cpp (with props) branches/shell-experiments/base/shell/rshell/precomp.h (with props) branches/shell-experiments/base/shell/rshell/rshell.spec (with props) Modified: branches/shell-experiments/base/shell/CMakeLists.txt Modified: branches/shell-experiments/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/CM… ============================================================================== --- branches/shell-experiments/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/CMakeLists.txt [iso-8859-1] Tue Feb 4 12:11:51 2014 @@ -3,3 +3,4 @@ add_subdirectory(explorer) add_subdirectory(explorer-new) add_subdirectory(filebrowser) +add_subdirectory(rshell) Propchange: branches/shell-experiments/base/shell/rshell/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Feb 4 12:11:51 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/shell-experiments/base/shell/rshell/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/shell-experiments/base/shell/rshell/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/shell-experiments/base/shell/rshell/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp (from r61883, trunk/reactos/dll/win32/shell32/desktop.cpp) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- trunk/reactos/dll/win32/shell32/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] Tue Feb 4 12:11:51 2014 @@ -209,6 +209,12 @@ SetShellWindowEx(hWnd, FindDesktopListView()); +#if 1 + /* A windows 8 specific hack */ + ::ShowWindow(hWndShellView, SW_SHOW); + ::ShowWindow(FindDesktopListView(), SW_SHOW); +#endif + return TRUE; } @@ -258,6 +264,8 @@ { return S_FALSE; } + +typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) { @@ -266,7 +274,15 @@ * find an open shell window that shows the requested pidl and activate it */ - return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, 0); +#if 0 + HMODULE hBrowseui = LoadLibraryW(L"browseui.dll"); + if (hBrowseui) + { + SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME)GetProcAddress(hBrowseui, (LPCSTR)103); + return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, 0); + } +#endif + return E_FAIL; } HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm) Added: 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 (added) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Tue Feb 4 12:11:51 2014 @@ -0,0 +1,31 @@ +PROJECT(SHELL) + +set_cpp(WITH_RUNTIME) + +include_directories(${REACTOS_SOURCE_DIR}/lib/atl) + +spec2def(rshell.dll rshell.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + CDesktopBrowser.cpp + CStartMenu.cpp + misc.cpp + ${CMAKE_CURRENT_BINARY_DIR}/rshell.def) + +add_library(rshell SHARED ${SOURCE}) + +set_module_type(rshell win32dll UNICODE) + +target_link_libraries(rshell + atlnew + uuid + wine) + +add_importlibs(rshell + shlwapi + shell32 + ole32 + user32 + msvcrt + kernel32 + ntdll) Propchange: branches/shell-experiments/base/shell/rshell/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Tue Feb 4 12:11:51 2014 @@ -0,0 +1,318 @@ +/* + * ReactOS Explorer + * + * Copyright 2014 Giannis Adamopoulos + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "precomp.h" + +/* NOTE: The following constants may *NOT* be changed because + they're hardcoded and need to be the exact values + in order to get the start menu to work! */ +#define IDM_PROGRAMS 504 +#define IDM_FAVORITES 507 +#define IDM_DOCUMENTS 501 +#define IDM_SETTINGS 508 +#define IDM_CONTROLPANEL 505 +#define IDM_SECURITY 5001 +#define IDM_NETWORKCONNECTIONS 557 +#define IDM_PRINTERSANDFAXES 510 +#define IDM_TASKBARANDSTARTMENU 413 +#define IDM_SEARCH 520 +#define IDM_HELPANDSUPPORT 503 +#define IDM_RUN 401 +#define IDM_SYNCHRONIZE 553 +#define IDM_LOGOFF 402 +#define IDM_DISCONNECT 5000 +#define IDM_UNDOCKCOMPUTER 410 +#define IDM_SHUTDOWN 506 +#define IDM_LASTSTARTMENU_SEPARATOR 450 + +/* + * TODO: + * 1. append the start menu contents from all users + * 2. implement the context menu for start menu entries (programs, control panel, network connetions, printers) + * 3. filter out programs folder from the shell folder part of the start menu + */ + +class CShellMenuCallback : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellMenuCallback +{ +private: + + HWND m_hwndTray; + CComPtr<IShellMenu> m_pShellMenu; + CComPtr<IBandSite> m_pBandSite; + CComPtr<IDeskBar> m_pDeskBar; + CComPtr<ITrayPriv> m_pTrayPriv; + + HRESULT OnInitMenu() + { + HMENU hmenu; + HRESULT hr; + + if (m_pTrayPriv.p) + return S_OK; + + hr = IUnknown_GetSite(m_pDeskBar, IID_PPV_ARG(ITrayPriv, &m_pTrayPriv)); + hr = IUnknown_GetWindow(m_pTrayPriv, &m_hwndTray); + hr = m_pTrayPriv->AppendMenuW(&hmenu); + hr = m_pShellMenu->SetMenu(hmenu, NULL, SMSET_BOTTOM); + + return hr; + } + + HRESULT OnGetInfo(LPSMDATA psmd, SMINFO *psminfo) + { + int iconIndex = 0; + + switch (psmd->uId) + { + case IDM_PROGRAMS: iconIndex = -20; break; + case IDM_FAVORITES: iconIndex = -173; break; + case IDM_DOCUMENTS: iconIndex = -21; break; + case IDM_SETTINGS: iconIndex = -22; break; + case IDM_CONTROLPANEL: iconIndex = -22; break; + //case IDM_SECURITY: iconIndex = -21; break; + case IDM_NETWORKCONNECTIONS: iconIndex = -257; break; + case IDM_PRINTERSANDFAXES: iconIndex = -138; break; + case IDM_TASKBARANDSTARTMENU: iconIndex = -40; break; + case IDM_SEARCH: iconIndex = -23; break; + case IDM_HELPANDSUPPORT: iconIndex = -24; break; + case IDM_RUN: iconIndex = -25; break; + //case IDM_SYNCHRONIZE: iconIndex = -21; break; + case IDM_LOGOFF: iconIndex = -45; break; + //case IDM_DISCONNECT: iconIndex = -21; break; + //case IDM_UNDOCKCOMPUTER: iconIndex = -21; break; + case IDM_SHUTDOWN: iconIndex = -28; break; + default: + return S_FALSE; + } + + if (iconIndex) + { + psminfo->dwMask = SMIM_ICON; + psminfo->iIcon = Shell_GetCachedImageIndex(L"shell32.dll", iconIndex, FALSE); + } + return S_OK; + } + + HRESULT OnGetSubMenu(LPSMDATA psmd, REFIID iid, void ** pv) + { + HRESULT hr; + int csidl = 0; + IShellMenu *pShellMenu; + + switch (psmd->uId) + { + case IDM_PROGRAMS: csidl = CSIDL_PROGRAMS; break; + case IDM_FAVORITES: csidl = CSIDL_FAVORITES; break; + case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break; + } + + hr = CoCreateInstance(CLSID_MenuBand, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellMenu,&pShellMenu)); + + hr = pShellMenu->Initialize(this, 0, ANCESTORDEFAULT, SMINIT_VERTICAL); + + if (csidl) + { + LPITEMIDLIST pidlStartMenu; + IShellFolder *psfDestop, *psfStartMenu; + + hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlStartMenu); + hr = SHGetDesktopFolder(&psfDestop); + hr = psfDestop->BindToObject(pidlStartMenu, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenu)); + + hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0); + } + else + { + MENUITEMINFO mii; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_SUBMENU; + if (GetMenuItemInfoW( psmd->hmenu, psmd->uId, FALSE, &mii)) + { + hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM); + } + } + return pShellMenu->QueryInterface(iid, pv); + } + + HRESULT OnGetContextMenu(LPSMDATA psmd, REFIID iid, void ** pv) + { + if (psmd->uId == IDM_PROGRAMS || + psmd->uId == IDM_CONTROLPANEL || + psmd->uId == IDM_NETWORKCONNECTIONS || + psmd->uId == IDM_PRINTERSANDFAXES) + { + //UNIMPLEMENTED + } + + return S_FALSE; + } + + HRESULT OnGetObject(LPSMDATA psmd, REFIID iid, void ** pv) + { + if (IsEqualIID(iid , IID_IShellMenu)) + return OnGetSubMenu(psmd, iid, pv); + else if (IsEqualIID( iid, IID_IContextMenu)) + return OnGetContextMenu(psmd, iid, pv); + + return S_FALSE; + } + + HRESULT OnExec(LPSMDATA psmd) + { + if(psmd->uId == IDM_CONTROLPANEL) + ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL,NULL, 1); + else if(psmd->uId == IDM_NETWORKCONNECTIONS) + ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL,NULL, 1); + else if(psmd->uId == IDM_PRINTERSANDFAXES) + ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL,NULL, 1); + else + PostMessageW( m_hwndTray, WM_COMMAND, psmd->uId, 0); + + return S_OK; + } + +public: + + DECLARE_NOT_AGGREGATABLE(CShellMenuCallback) + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CShellMenuCallback) + COM_INTERFACE_ENTRY_IID(IID_IShellMenuCallback, IShellMenuCallback) + END_COM_MAP() + + void Initialize( + IShellMenu* pShellMenu, + IBandSite* pBandSite, + IDeskBar* pDeskBar) + { + m_pShellMenu.Attach(pShellMenu); + m_pBandSite.Attach(pBandSite); + m_pDeskBar.Attach(pDeskBar); + } + + ~CShellMenuCallback() + { + m_pShellMenu.Release(); + m_pBandSite.Release(); + m_pDeskBar.Release(); + } + + HRESULT STDMETHODCALLTYPE CallbackSM( + LPSMDATA psmd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) + { + switch (uMsg) + { + case SMC_INITMENU: + return OnInitMenu(); + case SMC_GETINFO: + return OnGetInfo(psmd, reinterpret_cast<SMINFO*>(lParam)); + case SMC_GETOBJECT: + return OnGetObject(psmd, *reinterpret_cast<IID *>(wParam), reinterpret_cast<void **>(lParam)); + case SMC_EXEC: + return OnExec(psmd); + case SMC_SFEXEC: + m_pTrayPriv->Execute(psmd->psf, psmd->pidlItem); + break; + } + + return S_FALSE; + } +}; + +extern "C" +HRESULT +CStartMenu_Constructor( + REFIID riid, + void **ppv) +{ + IShellMenu* pShellMenu; + IBandSite* pBandSite; + IDeskBar* pDeskBar; + IShellMenuCallback* callback; + LPITEMIDLIST pidlStartMenu; + + HRESULT hr; + IShellFolder *shellFolder; + IShellFolder *psfStartMenu; + + hr = CoCreateInstance(CLSID_MenuBand, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellMenu, &pShellMenu)); + if (FAILED(hr)) + return NULL; + +#if 1 + hr = CoCreateInstance(CLSID_MenuBandSite, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IBandSite, &pBandSite)); +#else + hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); +#endif + if (FAILED(hr)) + return NULL; + + hr = CoCreateInstance(CLSID_MenuDeskBar, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IDeskBar, &pDeskBar)); + if (FAILED(hr)) + return NULL; + + CComObject<CShellMenuCallback> *pCallback; + hr = CComObject<CShellMenuCallback>::CreateInstance(&pCallback); + if (FAILED(hr)) + return FALSE; + pCallback->AddRef(); // CreateInstance returns object with 0 ref count */ + pCallback->Initialize(pShellMenu, pBandSite, pDeskBar); + callback = pCallback; + + hr = CShellMenuCallback::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellMenuCallback, &callback)); + if (FAILED(hr)) + return NULL; + + pShellMenu->Initialize(pCallback, -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); + if (FAILED(hr)) + return NULL; + + hr = SHGetFolderLocation(NULL, CSIDL_STARTMENU, 0, 0, &pidlStartMenu); + hr = SHGetDesktopFolder(&shellFolder); + hr = shellFolder->BindToObject(pidlStartMenu, NULL, IID_IShellFolder, (void**)&psfStartMenu); + + hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0); + + hr = pDeskBar->SetClient(pBandSite); + if (FAILED(hr)) + return NULL; + + hr = pBandSite->AddBand(pShellMenu); + if (FAILED(hr)) + return NULL; + + return pDeskBar->QueryInterface(riid, ppv); +} Propchange: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/misc.cpp (added) +++ branches/shell-experiments/base/shell/rshell/misc.cpp [iso-8859-1] Tue Feb 4 12:11:51 2014 @@ -0,0 +1,60 @@ +/* + * ReactOS Explorer + * + * Copyright 2014 Giannis Adamopoulos + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "precomp.h" + +DWORD WINAPI WinList_Init(void) +{ + /* do something here (perhaps we may want to add our own implementation fo win8) */ + return 0; +} + +void *operator new (size_t, void *buf) +{ + return buf; +} + +class CRShellModule : public CComModule +{ +public: +}; + +CRShellModule gModule; +CAtlWinModule gWinModule; + +STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) +{ + if (dwReason == DLL_PROCESS_ATTACH) + { + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CRShellModule; + new (&gWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; + + gModule.Init(NULL, hInstance, NULL); + DisableThreadLibraryCalls (hInstance); + } + else if (dwReason == DLL_PROCESS_DETACH) + { + gModule.Term(); + } + return TRUE; +} Propchange: branches/shell-experiments/base/shell/rshell/misc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Tue Feb 4 12:11:51 2014 @@ -0,0 +1,55 @@ + +#include <stdio.h> +#include <tchar.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wingdi.h> +#include <winnls.h> +#include <wincon.h> +#include <shellapi.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlwapi.h> +#include <shlguid_undoc.h> +#include <uxtheme.h> +#include <strsafe.h> + +#include <atlbase.h> +#include <atlcom.h> +#include <wine/debug.h> + +#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, void **ppv); + +#define INTERFACE IExplorerHostCreator +DECLARE_INTERFACE_(IExplorerHostCreator,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + /*** IExplorerHostCreator ***/ + STDMETHOD_(HRESULT,CreateHost)(/*THIS,*/ const GUID* guid) PURE; + STDMETHOD_(HRESULT,RunHost)(THIS) PURE; +}; +#undef INTERFACE + +#if defined(COBJMACROS) +/*** IUnknown methods ***/ +#define IExplorerHostCreator_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IExplorerHostCreator_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IExplorerHostCreator_Release(p) (p)->lpVtbl->Release(p) +/*** IExplorerHostCreator methods ***/ +#define IExplorerHostCreator_CreateHost(p,a) (p)->lpVtbl->CreateHost(p,a) +#define IExplorerHostCreator_RunHost(p) (p)->lpVtbl->RunHost(p) +#endif Propchange: branches/shell-experiments/base/shell/rshell/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/rshell.spec (added) +++ branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] Tue Feb 4 12:11:51 2014 @@ -0,0 +1,4 @@ +@ stdcall CStartMenu_Constructor(ptr ptr) +@ stdcall SHDesktopMessageLoop(ptr) +@ stdcall SHCreateDesktop(ptr) +@ stdcall WinList_Init() Propchange: branches/shell-experiments/base/shell/rshell/rshell.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61977: [VBEMP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: akhaldi Date: Tue Feb 4 11:08:27 2014 New Revision: 61977 URL: http://svn.reactos.org/svn/reactos?rev=61977&view=rev Log: [VBEMP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.c trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h Modified: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.c [iso-8859-1] Tue Feb 4 11:08:27 2014 @@ -28,6 +28,8 @@ /* INCLUDES *******************************************************************/ #include "vbemp.h" + +#include <devioctl.h> #undef LOWORD #undef HIWORD Modified: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h [iso-8859-1] Tue Feb 4 11:08:27 2014 @@ -20,12 +20,10 @@ /* INCLUDES *******************************************************************/ -#include "ntdef.h" -#include "dderror.h" -#include "devioctl.h" -#include "miniport.h" -#include "ntddvdeo.h" -#include "video.h" +#include <ntdef.h> +#include <dderror.h> +#include <miniport.h> +#include <video.h> #define TAG_VBE ' EBV'

1 0

[gadamopoulos] 61976: - Add filebrowser to build
by gadamopoulos＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: gadamopoulos Date: Tue Feb 4 10:55:46 2014 New Revision: 61976 URL: http://svn.reactos.org/svn/reactos?rev=61976&view=rev Log: - Add filebrowser to build Modified: branches/shell-experiments/base/shell/CMakeLists.txt branches/shell-experiments/base/shell/filebrowser/filebrowser.c Modified: branches/shell-experiments/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/CM… ============================================================================== --- branches/shell-experiments/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/CMakeLists.txt [iso-8859-1] Tue Feb 4 10:55:46 2014 @@ -2,3 +2,4 @@ add_subdirectory(cmd) add_subdirectory(explorer) add_subdirectory(explorer-new) +add_subdirectory(filebrowser) Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Tue Feb 4 10:55:46 2014 @@ -20,9 +20,9 @@ #include <stdio.h> #include <tchar.h> -#include <Windows.h> -#include <ShObjIdl.h> -#include <ShlObj.h> +#include <windows.h> +#include <shobjidl.h> +#include <shlobj.h> typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14);

1 0

[akhaldi] 61975: [TDILIB] * Create a main header and move inclusions to it. CORE-7716
by akhaldi＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: akhaldi Date: Tue Feb 4 10:52:50 2014 New Revision: 61975 URL: http://svn.reactos.org/svn/reactos?rev=61975&view=rev Log: [TDILIB] * Create a main header and move inclusions to it. CORE-7716 Added: trunk/reactos/lib/tdilib/precomp.h (with props) Modified: trunk/reactos/lib/tdilib/enum.c trunk/reactos/lib/tdilib/handle.c Modified: trunk/reactos/lib/tdilib/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/tdilib/enum.c?rev=6197… ============================================================================== --- trunk/reactos/lib/tdilib/enum.c [iso-8859-1] (original) +++ trunk/reactos/lib/tdilib/enum.c [iso-8859-1] Tue Feb 4 10:52:50 2014 @@ -5,7 +5,8 @@ * PURPOSE: TDI entity enumeration */ -#include "iphlpapi_private.h" +#include "precomp.h" + #include "tdilib.h" /* A generic thing-getting function which interacts in the right way with Modified: trunk/reactos/lib/tdilib/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/tdilib/handle.c?rev=61… ============================================================================== --- trunk/reactos/lib/tdilib/handle.c [iso-8859-1] (original) +++ trunk/reactos/lib/tdilib/handle.c [iso-8859-1] Tue Feb 4 10:52:50 2014 @@ -5,7 +5,7 @@ * PURPOSE: TDI transport handle management */ -#include "iphlpapi_private.h" +#include "precomp.h" const PWCHAR TcpFileName = L"\\Device\\Tcp"; Added: trunk/reactos/lib/tdilib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/tdilib/precomp.h?rev=6… ============================================================================== --- trunk/reactos/lib/tdilib/precomp.h (added) +++ trunk/reactos/lib/tdilib/precomp.h [iso-8859-1] Tue Feb 4 10:52:50 2014 @@ -0,0 +1,6 @@ +#ifndef _TDILIB_PCH_ +#define _TDILIB_PCH_ + +#include <iphlpapi_private.h> + +#endif /* _TDILIB_PCH_ */ Propchange: trunk/reactos/lib/tdilib/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 61974: [filebrowser] - Add an experimental module called FileBrowser.exe. This program works standalone in windows xp and windows 2003 and opens a new file browser window in its own ...
by gadamopoulos＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: gadamopoulos Date: Tue Feb 4 10:49:39 2014 New Revision: 61974 URL: http://svn.reactos.org/svn/reactos?rev=61974&view=rev Log: [filebrowser] - Add an experimental module called FileBrowser.exe. This program works standalone in windows xp and windows 2003 and opens a new file browser window in its own process. If our browseui.dll is in the same folder, filebrowser will use the implementation of our file browser in windows. That means that standalone it works only in xp and 2003 but with our own browseui it will work on all windows versions (but doesn't work on all for now). This can be used for both testing the implementation of our file browser in windows and as a host process for new file browser windows for explorer_new.exe + rshell.dll Added: branches/shell-experiments/base/shell/filebrowser/ (with props) branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt (with props) branches/shell-experiments/base/shell/filebrowser/filebrowser.c (with props) branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.manifest (with props) branches/shell-experiments/base/shell/filebrowser/filebrowser.rc (with props) Propchange: branches/shell-experiments/base/shell/filebrowser/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Feb 4 10:49:39 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/shell-experiments/base/shell/filebrowser/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/shell-experiments/base/shell/filebrowser/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/shell-experiments/base/shell/filebrowser/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt (added) +++ branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] Tue Feb 4 10:49:39 2014 @@ -0,0 +1,14 @@ + +PROJECT(SHELL) + +list(APPEND SOURCE + filebrowser.c + filebrowser.rc) + +add_executable(filebrowser ${SOURCE}) +set_module_type(filebrowser win32gui UNICODE) +add_importlibs(filebrowser + shell32 + msvcrt + kernel32) + Propchange: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c (added) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Tue Feb 4 10:49:39 2014 @@ -0,0 +1,44 @@ +/* + * ReactOS Explorer + * + * Copyright 2014 Giannis Adamopoulos + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdio.h> +#include <tchar.h> +#include <Windows.h> +#include <ShObjIdl.h> +#include <ShlObj.h> + +typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); + +int _tmain(int argc, _TCHAR* argv[]) +{ + HMODULE hBrowseui = LoadLibraryW(L"browseui.dll"); + if (hBrowseui) + { + SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME)GetProcAddress(hBrowseui, (LPCSTR)103); + LPITEMIDLIST pidlDrives; + HRESULT hRet = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives); + SHOpenNewFrame((LPITEMIDLIST)pidlDrives, NULL, 0, 0); + } + + Sleep(3000); + + return 0; +} + Propchange: branches/shell-experiments/base/shell/filebrowser/filebrowser.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.manifest URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.manifest (added) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.manifest [iso-8859-1] Tue Feb 4 10:49:39 2014 @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.FileBrowser" + type="win32" +/> +<description>This is ReactOS File Browser</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.manifest ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/base/shell/filebrowser/filebrowser.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.rc (added) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.rc [iso-8859-1] Tue Feb 4 10:49:39 2014 @@ -0,0 +1,11 @@ +#include <windef.h> +#include <winuser.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS File Browser" +#define REACTOS_STR_INTERNAL_NAME "filebrowser" +#define REACTOS_STR_ORIGINAL_FILENAME "filebrowser.exe" +#include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "filebrowser.exe.manifest" Propchange: branches/shell-experiments/base/shell/filebrowser/filebrowser.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61973: [ROSSYM] * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: akhaldi Date: Tue Feb 4 10:47:12 2014 New Revision: 61973 URL: http://svn.reactos.org/svn/reactos?rev=61973&view=rev Log: [ROSSYM] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/lib/rossym/delete.c trunk/reactos/lib/rossym/find.c trunk/reactos/lib/rossym/fromfile.c trunk/reactos/lib/rossym/frommem.c trunk/reactos/lib/rossym/fromraw.c trunk/reactos/lib/rossym/getraw.c trunk/reactos/lib/rossym/init.c trunk/reactos/lib/rossym/initkm.c trunk/reactos/lib/rossym/initum.c trunk/reactos/lib/rossym/zwfile.c Modified: trunk/reactos/lib/rossym/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/delete.c?rev=61… ============================================================================== --- trunk/reactos/lib/rossym/delete.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/delete.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -8,17 +8,12 @@ */ #define NTOSAPI -#include <ntddk.h> +#include <ntdef.h> #include <reactos/rossym.h> #include "rossympriv.h" - -#define NDEBUG -#include <debug.h> VOID RosSymDelete(PROSSYM_INFO RosSymInfo) { RosSymFreeMem(RosSymInfo); } - -/* EOF */ Modified: trunk/reactos/lib/rossym/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/find.c?rev=6197… ============================================================================== --- trunk/reactos/lib/rossym/find.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/find.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -35,7 +35,7 @@ * SUCH DAMAGE. */ -#include <ntddk.h> +#include <ntdef.h> #include <reactos/rossym.h> #include "rossympriv.h" Modified: trunk/reactos/lib/rossym/fromfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/fromfile.c?rev=… ============================================================================== --- trunk/reactos/lib/rossym/fromfile.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/fromfile.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -8,7 +8,7 @@ */ #define NTOSAPI -#include <ntddk.h> +#include <ntdef.h> #include <reactos/rossym.h> #include "rossympriv.h" #include <ntimage.h> Modified: trunk/reactos/lib/rossym/frommem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/frommem.c?rev=6… ============================================================================== --- trunk/reactos/lib/rossym/frommem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/frommem.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -8,7 +8,7 @@ */ #define NTOSAPI -#include <ntddk.h> +#include <ntdef.h> #include <reactos/rossym.h> #include "rossympriv.h" #include <ntimage.h> Modified: trunk/reactos/lib/rossym/fromraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/fromraw.c?rev=6… ============================================================================== --- trunk/reactos/lib/rossym/fromraw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/fromraw.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -8,7 +8,7 @@ */ #define NTOSAPI -#include <ntddk.h> +#include <ntdef.h> #include <reactos/rossym.h> #include "rossympriv.h" Modified: trunk/reactos/lib/rossym/getraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/getraw.c?rev=61… ============================================================================== --- trunk/reactos/lib/rossym/getraw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/getraw.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -8,12 +8,9 @@ */ #define NTOSAPI -#include <ntddk.h> +#include <ntdef.h> #include <reactos/rossym.h> #include "rossympriv.h" - -#define NDEBUG -#include <debug.h> ULONG RosSymGetRawDataLength(PROSSYM_INFO RosSymInfo) @@ -39,5 +36,3 @@ memcpy((char *) RawData + RosSymHeader->StringsOffset, RosSymInfo->Strings, RosSymHeader->StringsLength); } - -/* EOF */ Modified: trunk/reactos/lib/rossym/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/init.c?rev=6197… ============================================================================== --- trunk/reactos/lib/rossym/init.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/init.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -18,5 +18,3 @@ { RosSymCallbacks = *Callbacks; } - -/* EOF */ Modified: trunk/reactos/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/initkm.c?rev=61… ============================================================================== --- trunk/reactos/lib/rossym/initkm.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/initkm.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -10,12 +10,9 @@ #include <ntdef.h> #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#include <ntddk.h> +#include <wdm.h> #include <reactos/rossym.h> #include "rossympriv.h" - -#define NDEBUG -#include <debug.h> #define TAG_ROSSYM 'MYSR' Modified: trunk/reactos/lib/rossym/initum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/initum.c?rev=61… ============================================================================== --- trunk/reactos/lib/rossym/initum.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/initum.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -12,9 +12,6 @@ #include <winbase.h> #include <reactos/rossym.h> #include "rossympriv.h" - -#define NDEBUG -#include <debug.h> static PVOID RosSymAllocMemUM(ULONG_PTR Size) @@ -41,5 +38,3 @@ RosSymInit(&KmCallbacks); } - -/* EOF */ Modified: trunk/reactos/lib/rossym/zwfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/zwfile.c?rev=61… ============================================================================== --- trunk/reactos/lib/rossym/zwfile.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/zwfile.c [iso-8859-1] Tue Feb 4 10:47:12 2014 @@ -8,12 +8,9 @@ */ #define NTOSAPI -#include <ntddk.h> +#include <wdm.h> #include <reactos/rossym.h> #include "rossympriv.h" - -#define NDEBUG -#include <debug.h> BOOLEAN RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) @@ -48,5 +45,3 @@ return NT_SUCCESS(Status); } - -/* EOF */

1 0

[akhaldi] 61972: [RECYCLEBIN] * Move some inclusions to the main header. * Improve header inclusions. * Set the default debugging channel globally through the main header. * Remove inclusions and d...
by akhaldi＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: akhaldi Date: Tue Feb 4 10:45:55 2014 New Revision: 61972 URL: http://svn.reactos.org/svn/reactos?rev=61972&view=rev Log: [RECYCLEBIN] * Move some inclusions to the main header. * Improve header inclusions. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/lib/recyclebin/recyclebin.c trunk/reactos/lib/recyclebin/recyclebin.h trunk/reactos/lib/recyclebin/recyclebin_generic.c trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c trunk/reactos/lib/recyclebin/recyclebin_private.h trunk/reactos/lib/recyclebin/recyclebin_v5.c trunk/reactos/lib/recyclebin/recyclebin_v5.h trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c Modified: trunk/reactos/lib/recyclebin/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin.c [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -6,11 +6,7 @@ * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define COBJMACROS #include "recyclebin_private.h" -#include <stdio.h> - -WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); BOOL WINAPI CloseRecycleBinHandle( Modified: trunk/reactos/lib/recyclebin/recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.h [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin.h [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -8,12 +8,15 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> #include <winnls.h> #include <winver.h> #include <shellapi.h> #include <objbase.h> + #define ANY_SIZE 1 /* Structures used by the API Interface */ Modified: trunk/reactos/lib/recyclebin/recyclebin_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_generic.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_generic.c [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -6,11 +6,7 @@ * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define COBJMACROS #include "recyclebin_private.h" -#include <stdio.h> - -WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); struct RecycleBinGeneric { Modified: trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -6,11 +6,7 @@ * PROGRAMMERS: Copyright 2007 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define COBJMACROS #include "recyclebin_private.h" -#include <stdio.h> - -WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); struct RecycleBinGenericEnum { Modified: trunk/reactos/lib/recyclebin/recyclebin_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_private.h [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_private.h [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -1,6 +1,12 @@ +#include <stdio.h> + +#define COBJMACROS + #include "recyclebin.h" -#include "sddl.h" +#include "recyclebin_v5.h" + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); /* Defines */ Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -6,11 +6,9 @@ * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define COBJMACROS -#include "recyclebin_v5.h" -#include <stdio.h> - -WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); +#include "recyclebin_private.h" + +#include "sddl.h" static BOOL IntDeleteRecursive( Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.h [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.h [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -2,8 +2,6 @@ * This file is under the GPLv2 licence * Copyright (C) 2006 Hervé Poussineau <hpoussin(a)reactos.org> */ - -#include "recyclebin_private.h" #ifdef __cplusplus extern "C" { Modified: trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c [iso-8859-1] Tue Feb 4 10:45:55 2014 @@ -6,10 +6,7 @@ * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define COBJMACROS -#include "recyclebin_v5.h" - -WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); +#include "recyclebin_private.h" struct RecycleBin5File {

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