wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f9e1dbb83d850a2f7cb17079e02de139e2f8b920

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/shell32-SFGAO_HASSUBFOLDER/0001-shell32-Set-SFGAO_HASSUBFOLDER-correctly-for-unixfs.patch
View File

@@ -1,14 +1,15 @@
From f4ffa65bb956b052aa50faa9d7854b67ced4ef0f Mon Sep 17 00:00:00 2001
From 357fccddcd9891844a0d973d39b1bde6f6163033 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.
Subject: [PATCH] shell32: Set SFGAO_HASSUBFOLDER correctly for
unixfs.
---
dlls/shell32/shfldr_unixfs.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index e74e4dbf55a..a57bc68a408 100644
index 92d1728..ac24871 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
@@ -25,7 +26,7 @@ index e74e4dbf55a..a57bc68a408 100644
if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelativePath))
return E_INVALIDARG;
@@ -1154,8 +1156,23 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci
HeapFree( GetProcessHeap(), 0, dos_name );
heap_free( dos_name );
}
if (_ILIsFolder(apidl[i]))
- *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR |
@@ -51,5 +52,5 @@ index e74e4dbf55a..a57bc68a408 100644
*attrs |= SFGAO_STREAM;
if ((*attrs & SFGAO_LINK))
--
2.14.1
1.9.1