wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated shell32-UnixFS patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-02-21 13:39:19 +11:00
parent ad9df471b8
commit 9c74ae13d4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patches/shell32-UnixFS/0001-shell32-Do-not-use-unixfs-for-devices-without-mountp.patch
View File

@ -1,7 +1,7 @@
From 3f14ae155bcfb8145cab8f800366231563d30eac Mon Sep 17 00:00:00 2001
From 77d9da4571579004511b4328a34cdf575daf2139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 30 May 2015 23:31:34 +0200
Subject: shell32: Do not use unixfs for devices without mountpoint.
Subject: [PATCH] shell32: Do not use unixfs for devices without mountpoint.
---
dlls/shell32/shfldr_desktop.c | 17 ++++++++++++++++-
@ -9,10 +9,10 @@ Subject: shell32: Do not use unixfs for devices without mountpoint.
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index 4aa1dcf..addf6a7 100644
index 880291c..fba7dd6 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -184,11 +184,26 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
@@ -186,11 +186,26 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
}
else if (PathGetDriveNumberW (lpszDisplayName) >= 0)
{
@ -41,10 +41,10 @@ index 4aa1dcf..addf6a7 100644
}
else if (PathIsUNCW(lpszDisplayName))
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 1b457bb..f84bf32 100644
index bd4bba2..5eb47e4 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -4235,12 +4235,34 @@ static void test_ShellItemArrayGetAttributes(void)
@@ -4215,12 +4215,34 @@ static void test_ShellItemArrayGetAttributes(void)
Cleanup();
}
@ -79,7 +79,7 @@ index 1b457bb..f84bf32 100644
HRESULT hr;
BOOL ret, is_wow64;
@@ -4312,6 +4334,16 @@ if (0)
@@ -4286,6 +4308,16 @@ if (0)
}
IShellFolder_Release(desktop);
@ -89,13 +89,13 @@ index 1b457bb..f84bf32 100644
+ skip("No empty cdrom drive found, skipping test\n");
+ else
+ {
+ hr = pSHParseDisplayName(cdrom, NULL, &pidl1, 0, NULL);
+ hr = SHParseDisplayName(cdrom, NULL, &pidl1, 0, NULL);
+ ok(hr == S_OK, "failed %08x\n", hr);
+ if (SUCCEEDED(hr)) pILFree(pidl1);
+ if (SUCCEEDED(hr)) ILFree(pidl1);
+ }
}
static void test_desktop_IPersist(void)
--
2.4.2
1.9.1