Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 06:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Move dependency copying to the target script, so that the target properly depends on the source and not the other way around.
* Make all the custom constructors WINAPI.
* Add all the custom constructors to the spec file.
CORE-7596

svn path=/branches/shell-experiments/; revision=62365
This commit is contained in:
David Quintana 2014-03-01 11:46:04 +00:00
parent b35ff38428
commit 28bf05e265
14 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/shell/explorer-new/CMakeLists.txt
View file

@ -39,3 +39,9 @@ add_importlibs(explorer_new
ntdll)
add_pch(explorer_new precomp.h SOURCE)
add_cd_file(TARGET explorer_new DESTINATION reactos FOR all)
add_custom_command(TARGET explorer_new POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy
"$<TARGET_FILE:rshell>"
"$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>"
COMMENT "Copying $<TARGET_FILE_NAME:rshell> to output")

13
base/shell/filebrowser/CMakeLists.txt
View file

@ -11,4 +11,15 @@ add_importlibs(filebrowser
shell32
msvcrt
kernel32)
add_custom_command(TARGET filebrowser POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy
"$<TARGET_FILE:rshell>"
"$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>"
COMMENT "Copying $<TARGET_FILE_NAME:rshell> to output")
add_custom_command(TARGET filebrowser POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy
"$<TARGET_FILE:browseui>"
"$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>"
COMMENT "Copying $<TARGET_FILE_NAME:browseui> to output")

6
base/shell/rshell/CMakeLists.txt
View file

@ -43,9 +43,3 @@ add_importlibs(rshell
ntdll)
add_cd_file(TARGET rshell DESTINATION reactos FOR all)
add_custom_command(TARGET rshell POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy
"$<TARGET_FILE:rshell>"
"$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>"
COMMENT "Copying to output directory")

2
base/shell/rshell/CMenuBand.cpp
View file

@ -29,7 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
extern "C"
HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
{
*ppv = NULL;

2
base/shell/rshell/CMenuDeskBar.cpp
View file

@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36 } };
extern "C"
HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
{
*ppv = NULL;

2
base/shell/rshell/CMenuSite.cpp
View file

@ -26,7 +26,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(menusite);
extern "C"
HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv)
HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv)
{
*ppv = NULL;

2
base/shell/rshell/CMergedFolder.cpp
View file

@ -124,7 +124,7 @@ public:
};
extern "C"
HRESULT CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv)
HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv)
{
*ppv = NULL;

2
base/shell/rshell/logging/CMenuBandWrap.cpp
View file

@ -170,7 +170,7 @@ public:
};
extern "C"
HRESULT CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *ppv)
HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *ppv)
{
HRESULT hr;

2
base/shell/rshell/logging/CMenuDeskBarWrap.cpp
View file

@ -110,7 +110,7 @@ public:
};
extern "C"
HRESULT CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv)
HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv)
{
HRESULT hr;

2
base/shell/rshell/logging/CMenuSiteWrap.cpp
View file

@ -104,7 +104,7 @@ public:
};
extern "C"
HRESULT CMenuSite_Wrapper(IBandSite * bandSite, REFIID riid, LPVOID *ppv)
HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bandSite, REFIID riid, LPVOID *ppv)
{
HRESULT hr;

2
base/shell/rshell/logging/CStartMenuSiteWrap.cpp
View file

@ -70,7 +70,7 @@ public:
};
extern "C"
HRESULT CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv)
HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv)
{
HRESULT hr;

18
base/shell/rshell/precomp.h
View file

@ -41,14 +41,16 @@
#define SMC_EXEC 4
extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc);
extern "C" HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv);
extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv);
extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv);
extern "C" HRESULT CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, LPVOID *ppv);
extern "C" HRESULT CMenuSite_Wrapper(IBandSite * bs, REFIID riid, LPVOID *ppv);
extern "C" HRESULT CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, LPVOID *ppv);
extern "C" HRESULT CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv);
extern "C" HRESULT CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv);
extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bs, REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv);
extern "C" HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv);
static __inline ULONG
Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)

3
base/shell/rshell/rshell.spec
View file

@ -1,4 +1,7 @@
@ stdcall CStartMenu_Constructor(ptr ptr)
@ stdcall CMenuDeskBar_Constructor(ptr ptr);
@ stdcall CMenuSite_Constructor(ptr ptr);
@ stdcall CMenuBand_Constructor(ptr ptr);
@ stdcall SHDesktopMessageLoop(ptr)
@ stdcall SHCreateDesktop(ptr)
@ stdcall WinList_Init()

1
dll/win32/browseui/CMakeLists.txt
View file

@ -1,3 +1,4 @@
PROJECT(SHELL)
set_cpp(WITH_RUNTIME)