wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-03-30 13:01:06 +11:00
parent ec58b6f6b1
commit 4e3fb17588
7 changed files with 39 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/shell32-SHELL_execute/0001-shell32-Properly-fail-when-a-data-object-cannot-be-i.patch
View File

@ -1,4 +1,4 @@
From 9f4fcf82f0a37cc856a191ec9d1f178b9df722c0 Mon Sep 17 00:00:00 2001
From ba48d35b9f8659c1463b6a70b1804df4b4cca4d6 Mon Sep 17 00:00:00 2001
From: Mark Jansen <learn0more+wine@gmail.com>
Date: Sun, 4 Jun 2017 22:12:20 +0200
Subject: [PATCH] shell32: Properly fail when a data object cannot be
@ -10,7 +10,7 @@ Subject: [PATCH] shell32: Properly fail when a data object cannot be
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 3034008..8d6364b 100644
index a2d4e5d20f..cdb8e7e152 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1317,6 +1317,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC
@ -55,8 +55,8 @@ index 3034008..8d6364b 100644
- WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;
+ WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL;
DWORD dwApplicationNameLen = MAX_PATH+2;
DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR);
DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR);
DWORD parametersLen = ARRAY_SIZE(parametersBuffer);
DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer);
@@ -1694,6 +1715,29 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName));
}
@ -96,7 +96,7 @@ index 3034008..8d6364b 100644
heap_free(wszApplicationName);
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 7cdae87..f5f1d77 100644
index 7cdae878db..f5f1d77b43 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1829,7 +1829,7 @@ static fileurl_tests_t fileurl_tests[]=
@ -141,5 +141,5 @@ index 7cdae87..f5f1d77 100644
/* Should just run our executable */
--
1.9.1
2.16.2