[SHELL32]

* Comment out some unused variables.
* Remove some unused default debug channel declarations.

svn path=/trunk/; revision=62401

diff --git a/reactos/dll/win32/shell32/CMenuDeskBar.cpp b/reactos/dll/win32/shell32/CMenuDeskBar.cpp
index 140b663..485553b 100644 (file)
--- a/reactos/dll/win32/shell32/CMenuDeskBar.cpp
+++ b/reactos/dll/win32/shell32/CMenuDeskBar.cpp
@@ -1,7 +1,5 @@
 #include "precomp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
-
 HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(
     POINTL *ppt,
     RECTL *prcExclude,
@@ -137,4 +135,3 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(THIS_ LPMSG lpMsg
 {
     return S_OK;
 }
-

diff --git a/reactos/dll/win32/shell32/folders.cpp b/reactos/dll/win32/shell32/folders.cpp
index 1450164..9df6d6d 100644 (file)
--- a/reactos/dll/win32/shell32/folders.cpp
+++ b/reactos/dll/win32/shell32/folders.cpp
@@ -19,8 +19,6 @@
 
 #include "precomp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
-
 WCHAR swShell32Name[MAX_PATH];
 
 DWORD NumIconOverlayHandlers = 0;

diff --git a/reactos/dll/win32/shell32/shellpath.cpp b/reactos/dll/win32/shell32/shellpath.cpp
index 8511fef..de7e7e7 100644 (file)
--- a/reactos/dll/win32/shell32/shellpath.cpp
+++ b/reactos/dll/win32/shell32/shellpath.cpp
@@ -564,16 +564,20 @@ static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'};
 static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'};
 static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'};
 static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'};
+static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
+static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
+
+#if 0
 static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0};
 static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0};
 static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'};
-static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
-static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
+static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'};
+static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'};
+#endif
+
 /* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're
  * acting more Windows 9x-like for now.
  */
-static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'};
-static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'};
 
 typedef enum _CSIDL_Type {
     CSIDL_Type_User,

diff --git a/reactos/dll/win32/shell32/shpolicy.cpp b/reactos/dll/win32/shell32/shpolicy.cpp
index c9f0ef3..69d9296 100644 (file)
--- a/reactos/dll/win32/shell32/shpolicy.cpp
+++ b/reactos/dll/win32/shell32/shpolicy.cpp
@@ -67,7 +67,7 @@ static const char strNoChangeStartMenu[] = {"NoChangeStartMenu"};
 static const char strNoWindowsUpdate[] = {"NoWindowsUpdate"};
 static const char strNoSetActiveDesktop[] = {"NoSetActiveDesktop"};
 static const char strNoForgetSoftwareUpdate[] = {"NoForgetSoftwareUpdate"};
-static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"};
+//static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"};
 static const char strForceCopyACLW[] = {"ForceCopyACLWithFile"};
 static const char strNoResolveTrk[] = {"NoResolveTrack"};
 static const char strNoResolveSearch[] = {"NoResolveSearch"};