wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against bf42dca35f05bce9996e91f59cc47b5a9e6996b2.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2022-02-19 14:06:25 +11:00
parent dec87df6ec
commit 99c88fee27
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "5a66eab725423951860676aef49feeb3668eb20c"
echo "bf42dca35f05bce9996e91f59cc47b5a9e6996b2"
}
# Show version information

16
patches/server-default_integrity/0002-shell32-Implement-the-runas-verb.patch
View File

@ -1,4 +1,4 @@
From 5b1f4126d7eed65f68fb46bec05b226d75ce63e5 Mon Sep 17 00:00:00 2001
From ede24db26773b5ce2c2d7e13bf12939b55124281 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Fri, 26 Feb 2021 22:31:19 -0600
Subject: [PATCH] shell32: Implement the "runas" verb.
@ -14,10 +14,10 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index ba393ad7794..f6e108fd6bf 100644
index 8c7e3cf0808..c9a996a13dd 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -299,6 +299,21 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR psz
@@ -292,6 +292,21 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR psz
return hr;
}
@ -39,7 +39,7 @@ index ba393ad7794..f6e108fd6bf 100644
/*************************************************************************
* SHELL_ExecuteW [Internal]
*
@@ -312,6 +327,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
@@ -305,6 +320,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
UINT gcdret = 0;
WCHAR curdir[MAX_PATH];
DWORD dwCreationFlags;
@ -47,7 +47,7 @@ index ba393ad7794..f6e108fd6bf 100644
TRACE("Execute %s from directory %s\n", debugstr_w(lpCmd), debugstr_w(psei->lpDirectory));
@@ -333,8 +349,12 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
@@ -326,8 +342,12 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
if (!(psei->fMask & SEE_MASK_NO_CONSOLE))
dwCreationFlags |= CREATE_NEW_CONSOLE;
@ -62,15 +62,15 @@ index ba393ad7794..f6e108fd6bf 100644
{
/* Give 30 seconds to the app to come up, if desired. Probably only needed
when starting app immediately before making a DDE connection. */
@@ -354,6 +374,8 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
@@ -347,6 +367,8 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
retval = ERROR_BAD_FORMAT;
}
+ CloseHandle(token);
+
TRACE("returning %lu\n", retval);
TRACE("returning %Iu\n", retval);
psei_out->hInstApp = (HINSTANCE)retval;
--
2.33.0
2.34.1

18
patches/shdocvw-ParseURLFromOutsideSource_Tests/0001-shdocvw-Check-precisely-ParseURLFromOutsideSourceX-r.patch
View File

@ -1,4 +1,4 @@
From 64c5030300ca302fcc36f471feb27d9e46b56f30 Mon Sep 17 00:00:00 2001
From a929cd0341d3b2a340a94fa74259676a43e21e06 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Tue, 3 Sep 2013 23:28:14 +0200
Subject: [PATCH] shdocvw: Check precisely ParseURLFromOutsideSourceX returned
@ -15,10 +15,10 @@ Try 2:
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 52c622c609..ef9e3a7dfb 100644
index b5b60054f2c..50524cf43e0 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -379,8 +379,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
@@ -344,8 +344,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
HRESULT hr;
DWORD needed;
DWORD len;
@ -26,11 +26,11 @@ index 52c622c609..ef9e3a7dfb 100644
-
+ DWORD res;
TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown,
TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_w(url), out, plen, unknown,
plen ? *plen : 0, unknown ? *unknown : 0);
@@ -406,10 +405,12 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
@@ -371,10 +370,12 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
needed = lstrlenW(buffer_out)+1;
TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed);
TRACE("got 0x%lx with %s (need %ld)\n", hr, debugstr_w(buffer_out), needed);
+ res = 0;
if (*plen >= needed) {
@ -42,7 +42,7 @@ index 52c622c609..ef9e3a7dfb 100644
}
needed--;
}
@@ -452,6 +453,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
@@ -417,6 +418,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
if (*plen >= needed) {
if (out != NULL) {
WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, NULL);
@ -51,7 +51,7 @@ index 52c622c609..ef9e3a7dfb 100644
}
needed--;
diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c
index d54cf1613a..167fcf1a92 100644
index d54cf1613ac..167fcf1a92c 100644
--- a/dlls/shdocvw/tests/shdocvw.c
+++ b/dlls/shdocvw/tests/shdocvw.c
@@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void)
@ -88,5 +88,5 @@ index d54cf1613a..167fcf1a92 100644
--
2.17.1
2.34.1

14
patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch
View File

@ -1,4 +1,4 @@
From c414d9b1fa846d017e9749080645b3c0b201d242 Mon Sep 17 00:00:00 2001
From 12fc8bc5d9f0464b91d9412cd8a29ef5bda89caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 8 May 2017 23:33:45 +0200
Subject: [PATCH] shell32: Add security property tab.
@ -11,11 +11,11 @@ Subject: [PATCH] shell32: Add security property tab.
4 files changed, 438 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index e31c165ccff..bb03300f9c9 100644
index eeb6cd63d60..7cc704e56b6 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHELL32_
EXTRADEFS = -D_SHELL32_
MODULE = shell32.dll
IMPORTLIB = shell32
-IMPORTS = uuid shlwapi user32 gdi32 advapi32
@ -62,10 +62,10 @@ index 264947d337d..90898b7ed98 100644
/* FIXME: Some will be unused until desktop.ini support is implemented */
IDS_PROGRAMS "Programs"
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
index 6c05904bb91..43cbea2ec87 100644
index 176ce6061e6..57d0904af23 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -39,14 +39,133 @@
@@ -38,14 +38,133 @@
#include "shresdef.h"
#include "shlwapi.h"
@ -199,7 +199,7 @@ index 6c05904bb91..43cbea2ec87 100644
typedef struct
{
IContextMenu3 IContextMenu3_iface;
@@ -638,6 +757,269 @@ error:
@@ -637,6 +756,269 @@ error:
heap_free(props);
}
@ -469,7 +469,7 @@ index 6c05904bb91..43cbea2ec87 100644
#define MAX_PROP_PAGES 99
static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -717,6 +1099,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -716,6 +1098,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
if (SUCCEEDED(ret))
{
init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);

2
staging/upstream-commit
View File

@ -1 +1 @@
5a66eab725423951860676aef49feeb3668eb20c
bf42dca35f05bce9996e91f59cc47b5a9e6996b2