[ros-diffs] 01/01: [SHELL32] Fix some test failures

[Giannis Adamopoulos]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=730d81b9f7a7231668832…

commit 730d81b9f7a7231668832be2d9f38a0c93739956
Author:     Giannis Adamopoulos <gadamopoulos(a)reactos.org>
AuthorDate: Mon Feb 19 03:23:15 2018 +0200
Commit:     Giannis Adamopoulos <gadamopoulos(a)reactos.org>
CommitDate: Tue Feb 20 10:15:23 2018 +0200

    [SHELL32] Fix some test failures
---
 dll/win32/shell32/folders/CDesktopFolder.cpp | 2 +-
 dll/win32/shell32/folders/CDrivesFolder.cpp  | 2 +-
 dll/win32/shell32/folders/CMyDocsFolder.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp
b/dll/win32/shell32/folders/CDesktopFolder.cpp
index 6d9b66eb72..fc52702696 100644
--- a/dll/win32/shell32/folders/CDesktopFolder.cpp
+++ b/dll/win32/shell32/folders/CDesktopFolder.cpp
@@ -182,7 +182,7 @@ static const shvheader DesktopSFHeader[] = {
 
 static const DWORD dwDesktopAttributes =
     SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR |
-    SFGAO_STORAGEANCESTOR | SFGAO_HASPROPSHEET | SFGAO_STORAGE | SFGAO_CANLINK;
+    SFGAO_STORAGEANCESTOR | SFGAO_HASPROPSHEET | SFGAO_STORAGE;
 static const DWORD dwMyComputerAttributes =
     SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET |
     SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK;
diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp
b/dll/win32/shell32/folders/CDrivesFolder.cpp
index 91ffc4d506..a4c09b1f9e 100644
--- a/dll/win32/shell32/folders/CDrivesFolder.cpp
+++ b/dll/win32/shell32/folders/CDrivesFolder.cpp
@@ -373,7 +373,7 @@ static const shvheader MyComputerSFHeader[] = {
 
 static const DWORD dwComputerAttributes =
     SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET |
-    SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK;
+    SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
 static const DWORD dwControlPanelAttributes =
     SFGAO_HASSUBFOLDER | SFGAO_FOLDER | SFGAO_CANLINK;
 static const DWORD dwDriveAttributes =
diff --git a/dll/win32/shell32/folders/CMyDocsFolder.cpp
b/dll/win32/shell32/folders/CMyDocsFolder.cpp
index 0e1ae1b93c..f27448d811 100644
--- a/dll/win32/shell32/folders/CMyDocsFolder.cpp
+++ b/dll/win32/shell32/folders/CMyDocsFolder.cpp
@@ -74,7 +74,7 @@ HRESULT WINAPI CMyDocsFolder::GetAttributesOf(UINT cidl,
PCUITEMID_CHILD_ARRAY a
     if(cidl)
         return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut);
 
-    if (!rgfInOut || !apidl)
+    if (!rgfInOut)
         return E_INVALIDARG;
 
     if (*rgfInOut == 0)