[ros-diffs] [dquintana] 62365: [RSHELL] * 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...

Author: dquintana
Date: Sat Mar  1 11:46:04 2014
New Revision: 62365

URL: http://svn.reactos.org/svn/reactos?rev=62365&view=rev
Log:
[RSHELL]
* 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

Modified:
    branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt
    branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt
    branches/shell-experiments/base/shell/rshell/CMakeLists.txt
    branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
    branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
    branches/shell-experiments/base/shell/rshell/CMenuSite.cpp
    branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp
    branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp
    branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp
    branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp
    branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp
    branches/shell-experiments/base/shell/rshell/precomp.h
    branches/shell-experiments/base/shell/rshell/rshell.spec
    branches/shell-experiments/dll/win32/browseui/CMakeLists.txt

Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex…
==============================================================================
--- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt	[iso-8859-1] Sat Mar
 1 11:46:04 2014
@@ -39,3 +39,9 @@
     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")

Modified: 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	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt	[iso-8859-1] Sat Mar 
1 11:46:04 2014
@@ -11,4 +11,15 @@
     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")

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] Sat Mar  1
11:46:04 2014
@@ -43,9 +43,3 @@
     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")

Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] Sat Mar  1
11:46:04 2014
@@ -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;
 

Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] Sat Mar  1
11:46:04 2014
@@ -28,7 +28,7 @@
 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;
 

Modified: 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	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp	[iso-8859-1] Sat Mar  1
11:46:04 2014
@@ -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;
 

Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp	[iso-8859-1] Sat Mar  1
11:46:04 2014
@@ -124,7 +124,7 @@
 };
 
 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;
 

Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp	[iso-8859-1]
Sat Mar  1 11:46:04 2014
@@ -170,7 +170,7 @@
 };
 
 extern "C"
-HRESULT CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *ppv)
+HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *ppv)
 {
     HRESULT hr;
 

Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp	[iso-8859-1]
Sat Mar  1 11:46:04 2014
@@ -110,7 +110,7 @@
 };
 
 extern "C"
-HRESULT CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv)
+HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv)
 {
     HRESULT hr;
 

Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp	[iso-8859-1]
Sat Mar  1 11:46:04 2014
@@ -104,7 +104,7 @@
 };
 
 extern "C"
-HRESULT CMenuSite_Wrapper(IBandSite * bandSite, REFIID riid, LPVOID *ppv)
+HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bandSite, REFIID riid, LPVOID *ppv)
 {
     HRESULT hr;
 

Modified: branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
---
branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp	[iso-8859-1]
(original)
+++
branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp	[iso-8859-1]
Sat Mar  1 11:46:04 2014
@@ -70,7 +70,7 @@
 };
 
 extern "C"
-HRESULT CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv)
+HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv)
 {
     HRESULT hr;
 

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] Sat Mar  1
11:46:04 2014
@@ -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, ...)

Modified: 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	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/rshell.spec	[iso-8859-1] Sat Mar  1
11:46:04 2014
@@ -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()

Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/CMakeLists.txt	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/CMakeLists.txt	[iso-8859-1] Sat Mar  1
11:46:04 2014
@@ -1,3 +1,4 @@
+PROJECT(SHELL)
 
 set_cpp(WITH_RUNTIME)