merge ROS Shell without integrated explorer part into trunk

[reactos.git] / reactos / subsys / system / explorer / rosshell.dsp

diff --git a/reactos/subsys/system/explorer/rosshell.dsp b/reactos/subsys/system/explorer/rosshell.dsp
index 244e8a3..1e2f959 100644 (file)
--- a/reactos/subsys/system/explorer/rosshell.dsp
+++ b/reactos/subsys/system/explorer/rosshell.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Console Application" 0x0103\r
 \r
-CFG=rosshell - Win32 Release\r
+CFG=rosshell - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,13 @@ CFG=rosshell - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "rosshell.mak" CFG="rosshell - Win32 Release"\r
+!MESSAGE NMAKE /f "rosshell.mak" CFG="rosshell - Win32 Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "rosshell - Win32 Release" (based on "Win32 (x86) Console Application")\r
 !MESSAGE "rosshell - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "rosshell - Win32 Debug Release" (based on "Win32 (x86) Console Application")\r
 !MESSAGE "rosshell - Win32 Unicode Release" (based on "Win32 (x86) Console Application")\r
 !MESSAGE "rosshell - Win32 Unicode Debug" (based on "Win32 (x86) Console Application")\r
 !MESSAGE \r
@@ -44,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GR /GX /O1 /D "NDEBUG" /D "_NO_CONTEXT" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c\r
+# ADD CPP /nologo /MD /W3 /GR /GX /O1 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c\r
 # ADD BASE RSC /l 0x407 /d "NDEBUG"\r
 # ADD RSC /l 0x407 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -52,8 +53,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386\r
-# SUBTRACT LINK32 /pdb:none /force\r
+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll\r
+# SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "rosshell - Win32 Debug"\r
 \r
@@ -69,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c\r
 # ADD BASE RSC /l 0x407 /d "_DEBUG"\r
 # ADD RSC /l 0x407 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -77,8 +78,34 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
-# SUBTRACT LINK32 /pdb:none /force\r
+# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll\r
+# SUBTRACT LINK32 /pdb:none\r
+\r
+!ELSEIF  "$(CFG)" == "rosshell - Win32 Debug Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "DRelease"\r
+# PROP BASE Intermediate_Dir "DRelease"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "DRelease"\r
+# PROP Intermediate_Dir "DRelease"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_ROS_" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /c\r
+# ADD BASE RSC /l 0x407 /d "NDEBUG"\r
+# ADD RSC /l 0x407 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /delayload:oleaut32.dll /delayload:wsock32.dll\r
+# SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "rosshell - Win32 Unicode Release"\r
 \r
@@ -95,7 +122,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "_NO_CONTEXT" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c\r
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c\r
 # ADD BASE RSC /l 0x407 /d "NDEBUG"\r
 # ADD RSC /l 0x407 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -103,8 +130,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386\r
-# SUBTRACT LINK32 /pdb:none /force\r
+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll\r
+# SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "rosshell - Win32 Unicode Debug"\r
 \r
@@ -121,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /FR /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c\r
 # ADD BASE RSC /l 0x407 /d "_DEBUG"\r
 # ADD RSC /l 0x407 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -129,8 +156,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
-# SUBTRACT LINK32 /pdb:none /force\r
+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll\r
+# SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
 \r
@@ -138,6 +165,7 @@ LINK32=link.exe
 \r
 # Name "rosshell - Win32 Release"\r
 # Name "rosshell - Win32 Debug"\r
+# Name "rosshell - Win32 Debug Release"\r
 # Name "rosshell - Win32 Unicode Release"\r
 # Name "rosshell - Win32 Unicode Debug"\r
 # Begin Group "utility"\r
@@ -187,6 +215,14 @@ SOURCE=.\utility\window.cpp
 \r
 SOURCE=.\utility\window.h\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\utility\xmlstorage.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\utility\xmlstorage.h\r
+# End Source File\r
 # End Group\r
 # Begin Group "resources"\r
 \r
@@ -233,6 +269,27 @@ SOURCE=.\res\documents.ico
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\res\dot.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\dot_red.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\dot_trans.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\drivebar.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\explorer-jp.rc"\r
+# PROP Exclude_From_Build 1\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\res\explorer.ico\r
 # End Source File\r
 # Begin Source File\r
@@ -257,6 +314,50 @@ SOURCE=.\res\folder.ico
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\res\icoali10.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig0.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig1.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig2.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig3.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig4.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig5.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig6.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig7.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig8.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\res\icoalig9.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\res\images.bmp\r
 # End Source File\r
 # Begin Source File\r
@@ -285,24 +386,23 @@ SOURCE=.\res\network.ico
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\res\printer.ico\r
+SOURCE=.\res\notify_l.ico\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\res\reactos.ico\r
+SOURCE=.\res\notify_r.ico\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\res\ros-big.ico"\r
+SOURCE=.\res\printer.ico\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\rosshell-jp.rc"\r
-# PROP Exclude_From_Build 1\r
+SOURCE=.\res\reactos.ico\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\res\rosshell.ico\r
+SOURCE=".\res\ros-big.ico"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -314,11 +414,11 @@ SOURCE=.\res\search.ico
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\res\startmenu.ico\r
+SOURCE=.\res\speaker.ico\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\res\toolbar.bmp\r
+SOURCE=.\res\startmenu.ico\r
 # End Source File\r
 # End Group\r
 # Begin Group "taskbar"\r
@@ -334,6 +434,18 @@ SOURCE=.\taskbar\desktopbar.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\taskbar\favorites.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\taskbar\favorites.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\notifyhook\notifyhook.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\taskbar\quicklaunch.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -390,20 +502,27 @@ SOURCE=.\shell\entries.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\shell\shellbrowser.h\r
+SOURCE=.\shell\filechild.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\shell\shellfs.cpp\r
+SOURCE=.\shell\pane.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\shell\shellfs.h\r
+SOURCE=.\shell\pane.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\shell\startup.c\r
-# SUBTRACT CPP /YX /Yc /Yu\r
+SOURCE=.\shell\shellbrowser.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\shell\shellfs.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\shell\shellfs.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -419,6 +538,14 @@ SOURCE=.\shell\winfs.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\dialogs\searchprogram.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\dialogs\searchprogram.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\dialogs\settings.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -447,6 +574,11 @@ SOURCE=.\globals.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=".\i386-stub-win32.c"\r
+# SUBTRACT CPP /YX /Yc /Yu\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\precomp.cpp\r
 # ADD CPP /Yc"precomp.h"\r
 # End Source File\r
@@ -455,5 +587,22 @@ SOURCE=.\precomp.cpp
 SOURCE=.\precomp.h\r
 # End Source File\r
 # End Group\r
+# Begin Group "services"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\services\shellservices.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\services\shellservices.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\services\startup.c\r
+# SUBTRACT CPP /YX /Yc /Yu\r
+# End Source File\r
+# End Group\r
 # End Target\r
 # End Project\r