[RSHELL][SHELL32]
authorThomas Faber <thomas.faber@reactos.org>
Wed, 19 Aug 2015 09:05:54 +0000 (09:05 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Wed, 19 Aug 2015 09:05:54 +0000 (09:05 +0000)
- Move rshell source files to a "shellmenu" static library under shell32
CORE-9892

svn path=/trunk/; revision=68763

22 files changed:
reactos/base/shell/rshell/CMakeLists.txt
reactos/base/shell/rshell/misc.cpp
reactos/dll/win32/shell32/CMakeLists.txt
reactos/dll/win32/shell32/shellmenu/CBandSite.cpp [moved from reactos/base/shell/rshell/CBandSite.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CBandSite.h [moved from reactos/base/shell/rshell/CBandSite.h with 100% similarity]
reactos/dll/win32/shell32/shellmenu/CDesktopBrowser.cpp [moved from reactos/base/shell/rshell/CDesktopBrowser.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CMakeLists.txt [new file with mode: 0644]
reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [moved from reactos/base/shell/rshell/CMenuBand.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuBand.h [moved from reactos/base/shell/rshell/CMenuBand.h with 100% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp [moved from reactos/base/shell/rshell/CMenuDeskBar.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h [moved from reactos/base/shell/rshell/CMenuDeskBar.h with 100% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp [moved from reactos/base/shell/rshell/CMenuFocusManager.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.h [moved from reactos/base/shell/rshell/CMenuFocusManager.h with 100% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp [moved from reactos/base/shell/rshell/CMenuSite.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuSite.h [moved from reactos/base/shell/rshell/CMenuSite.h with 100% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [moved from reactos/base/shell/rshell/CMenuToolbars.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CMenuToolbars.h [moved from reactos/base/shell/rshell/CMenuToolbars.h with 100% similarity]
reactos/dll/win32/shell32/shellmenu/CMergedFolder.cpp [moved from reactos/base/shell/rshell/CMergedFolder.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/CMergedFolder.h [moved from reactos/base/shell/rshell/CMergedFolder.h with 100% similarity]
reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp [moved from reactos/base/shell/rshell/CStartMenu.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp [moved from reactos/base/shell/rshell/ShellDDE.cpp with 99% similarity]
reactos/dll/win32/shell32/shellmenu/shellmenu.h [moved from reactos/base/shell/rshell/precomp.h with 100% similarity]

index 281b167..af12cd6 100644 (file)
@@ -2,22 +2,14 @@ PROJECT(SHELL)
 
 set_cpp(WITH_RUNTIME)
 
-include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/lib/atl
+    ${REACTOS_SOURCE_DIR}/dll/win32/shell32/shellmenu)
 
 spec2def(rshell.dll rshell.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
-    CBandSite.cpp
-    CDesktopBrowser.cpp
-    CMenuBand.cpp
-    CMenuDeskBar.cpp
-    CMenuFocusManager.cpp
-    CMenuSite.cpp
-    CMenuToolbars.cpp
-    CMergedFolder.cpp
-    CStartMenu.cpp
     misc.cpp
-    ShellDDE.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/rshell.def)
 
 add_library(rshell SHARED ${SOURCE})
@@ -25,6 +17,7 @@ add_library(rshell SHARED ${SOURCE})
 set_module_type(rshell win32dll UNICODE)
 
 target_link_libraries(rshell
+    shellmenu
     atlnew
     uuid
     wine)
index 28a03d1..a08eded 100644 (file)
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "precomp.h"
+#include "shellmenu.h"
 
 DWORD WINAPI WinList_Init(void)
 {
index 7cf0693..17d70af 100644 (file)
@@ -1,5 +1,7 @@
 PROJECT(SHELL)
 
+add_subdirectory(shellmenu)
+
 set_cpp(WITH_RUNTIME)
 spec2def(shell32.dll shell32.spec ADD_IMPORTLIB)
 
similarity index 99%
rename from reactos/base/shell/rshell/CBandSite.cpp
rename to reactos/dll/win32/shell32/shellmenu/CBandSite.cpp
index b6f97a4..55ae992 100644 (file)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#include "shellmenu.h"
 #include <shobjidl.h>
 
 #include "CBandSite.h"
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#include "shellmenu.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(desktop);
 
diff --git a/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt b/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2faca9e
--- /dev/null
@@ -0,0 +1,21 @@
+PROJECT(SHELL)
+
+set_cpp(WITH_RUNTIME)
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+
+list(APPEND SOURCE
+    CBandSite.cpp
+    CDesktopBrowser.cpp
+    CMenuBand.cpp
+    CMenuDeskBar.cpp
+    CMenuFocusManager.cpp
+    CMenuSite.cpp
+    CMenuToolbars.cpp
+    CMergedFolder.cpp
+    CStartMenu.cpp
+    ShellDDE.cpp)
+
+add_library(shellmenu ${SOURCE})
similarity index 99%
rename from reactos/base/shell/rshell/CMenuBand.cpp
rename to reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp
index 545d408..5f8fc3b 100644 (file)
@@ -17,7 +17,7 @@
  * 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 "shellmenu.h"
 #include <windowsx.h>
 #include <commoncontrols.h>
 #include <shlwapi_undoc.h>
@@ -17,7 +17,7 @@
  * 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 "shellmenu.h"
 #include <atlwin.h>
 #include <shlwapi_undoc.h>
 
@@ -39,7 +39,7 @@ While a system popup is open, it tracks the mouse movements so that it can cance
 and switch to another submenu when the mouse goes over another item from the parent.
 
 */
-#include "precomp.h"
+#include "shellmenu.h"
 #include <windowsx.h>
 #include <commoncontrols.h>
 #include <shlwapi_undoc.h>
similarity index 99%
rename from reactos/base/shell/rshell/CMenuSite.cpp
rename to reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp
index 9b05b3f..0a68160 100644 (file)
@@ -17,7 +17,7 @@
  * 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 "shellmenu.h"
 #include <atlwin.h>
 #include <shlwapi_undoc.h>
 
@@ -17,7 +17,7 @@
  * 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 "shellmenu.h"
 #include <commoncontrols.h>
 #include <shlwapi_undoc.h>
 #include <uxtheme.h>
@@ -17,7 +17,7 @@
  * 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 "shellmenu.h"
 #include <atlwin.h>
 #include <shlwapi_undoc.h>
 
@@ -17,7 +17,7 @@
  * 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"
+#include "shellmenu.h"
 
 #include "CMergedFolder.h"
 
similarity index 99%
rename from reactos/base/shell/rshell/ShellDDE.cpp
rename to reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp
index 2557724..dfbebdb 100644 (file)
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#include "shellmenu.h"
 #include <ddeml.h>
 #include <strsafe.h>
 #include <shlwapi_undoc.h>