Rebase against c91a531957acaf4cf7cdb985b5ba47a273f5f9b2.

This commit is contained in:
Sebastian Lackner
2017-09-27 05:09:54 +02:00
parent 094f2d8d0c
commit 13a6f6a44d
11 changed files with 183 additions and 329 deletions

View File

@@ -1,4 +1,4 @@
From e86e14d9db9067fa0312470ac1c8363171e57837 Mon Sep 17 00:00:00 2001
From f4ffa65bb956b052aa50faa9d7854b67ced4ef0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 15 Aug 2015 21:09:22 +0200
Subject: shell32: Set SFGAO_HASSUBFOLDER correctly for unixfs.
@@ -8,11 +8,11 @@ Subject: shell32: Set SFGAO_HASSUBFOLDER correctly for unixfs.
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index be1ba81..481ee06 100644
index e74e4dbf55a..a57bc68a408 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -1143,8 +1143,10 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci
SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSTEM;
SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSTEM | SFGAO_LINK;
lstrcpyA(szAbsolutePath, This->m_pszPath);
pszRelativePath = szAbsolutePath + lstrlenA(szAbsolutePath);
- for (i=0; i<cidl; i++) {
@@ -49,7 +49,7 @@ index be1ba81..481ee06 100644
+ }
else
*attrs |= SFGAO_STREAM;
}
if ((*attrs & SFGAO_LINK))
--
2.7.0
2.14.1