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

Rebase against 7f955f22d317cad1e7d5323179e9a0ee635c9768.

Browse Source
This commit is contained in:
Zebediah Figura 2018-05-08 17:53:51 -05:00
parent e9ce651159
commit ec4fd3ebdc
9 changed files with 48 additions and 687 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch
View File

@ -1,4 +1,4 @@
From bee86127f9ab33523d66ef7d28b8a44519a8852b Mon Sep 17 00:00:00 2001
From 2f853c3bc210e0aa49e47cade7ae81f47c3bd430 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Sat, 26 Jul 2014 12:31:50 -0600
Subject: iphlpapi: Implement AllocateAndGetTcpExTableFromStack. (v2)
@ -7,11 +7,11 @@ Based on a patch by Ralf Habacker.
---
dlls/iphlpapi/iphlpapi.spec | 1 +
dlls/iphlpapi/ipstats.c | 36 ++++++++++++++++++++++++++++++++++++
dlls/iphlpapi/ipstats.h | 1 +
include/iphlpapi.h | 1 +
3 files changed, 38 insertions(+)
diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
index 4be42fe9971..05d1ada5b07 100644
index 1686644..4769c3c 100644
--- a/dlls/iphlpapi/iphlpapi.spec
+++ b/dlls/iphlpapi/iphlpapi.spec
@@ -5,6 +5,7 @@
@ -23,10 +23,10 @@ index 4be42fe9971..05d1ada5b07 100644
@ stdcall AllocateAndGetUdpTableFromStack( ptr long long long )
@ stdcall CancelIPChangeNotify( ptr )
diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c
index 5965bf9dae6..4284b91bf20 100644
index 863edd3..2d7bdfd 100644
--- a/dlls/iphlpapi/ipstats.c
+++ b/dlls/iphlpapi/ipstats.c
@@ -2327,6 +2327,42 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO
@@ -2330,6 +2330,42 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO
return build_tcp_table( TCP_TABLE_BASIC_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL );
}
@ -69,18 +69,18 @@ index 5965bf9dae6..4284b91bf20 100644
static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size )
{
DWORD table_size;
diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h
index bf5bb9269fc..d8835aa3154 100644
--- a/dlls/iphlpapi/ipstats.h
+++ b/dlls/iphlpapi/ipstats.h
@@ -34,6 +34,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE
diff --git a/include/iphlpapi.h b/include/iphlpapi.h
index 54d93d1..8ed6c78 100644
--- a/include/iphlpapi.h
+++ b/include/iphlpapi.h
@@ -156,6 +156,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved,
DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN;
DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN;
+DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) DECLSPEC_HIDDEN;
DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN;
DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN;
DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags);
DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags);
+DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family);
DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags);
DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags);
--
2.11.0
2.7.4

1
patches/kernel32-Debugger/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [35928] Crash handlers/debuggers fail to display user-interface when invoked for crashing (non-interactive) service processes (inherited Wine service window station/desktop)

43
patches/ntdll-RtlQueryPackageIdentity/0001-ntdll-Add-stub-for-RtlQueryPackageIdentity.patch
View File

@ -1,43 +0,0 @@
From cd1986bee6af083bfcb46eebdc3c40d040f35b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 00:48:11 +0100
Subject: ntdll: Add stub for RtlQueryPackageIdentity.
---
dlls/ntdll/ntdll.spec | 1 +
dlls/ntdll/rtl.c | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 50f4acf5926..c6f15c53ded 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -810,6 +810,7 @@
@ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr)
@ stub RtlQueryInformationActiveActivationContext
@ stub RtlQueryInterfaceMemoryStream
+@ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr)
@ stub RtlQueryProcessBackTraceInformation
@ stdcall RtlQueryProcessDebugInformation(long long ptr)
@ stub RtlQueryProcessHeapInformation
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 09a9c921bb5..8ade7525f0e 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -1672,3 +1672,13 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void)
FIXME("stub!\n");
return NULL;
}
+
+/*********************************************************************
+ * RtlQueryPackageIdentity [NTDLL.@]
+ */
+NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *fullname_size,
+ WCHAR *appid, SIZE_T *appid_size, BOOLEAN *packaged)
+{
+ FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged);
+ return STATUS_NOT_FOUND;
+}
--
2.14.1

66
patches/ntdll-RtlQueryPackageIdentity/0002-include-Add-IApplicationActivationManager-interface-.patch
View File

@ -1,66 +0,0 @@
From 3148c0a69b1dd084541d0e2b09ddd8f47ec732fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 00:46:34 +0100
Subject: [PATCH] include: Add IApplicationActivationManager interface
declaration.
---
include/shobjidl.idl | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index e0fe01c..73278e4 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -3713,6 +3713,35 @@ interface IItemNameLimits : IUnknown
[out] int *max_length);
}
+typedef [v1_enum] enum ACTIVATEOPTIONS
+{
+ AO_NONE = 0x00000000,
+ AO_DESIGNMODE = 0x00000001,
+ AO_NOERRORUI = 0x00000002,
+ AO_NOSPLASHSCREEN = 0x00000004,
+ AO_PRELAUNCH = 0x02000000
+} ACTIVATEOPTIONS;
+
+[
+ uuid(2e941141-7f97-4756-ba1d-9decde894a3d),
+ object,
+ pointer_default(unique)
+]
+interface IApplicationActivationManager : IUnknown
+{
+ HRESULT ActivateApplication([in] LPCWSTR appusermodelid,
+ [in, unique] LPCWSTR arguments,
+ [in] ACTIVATEOPTIONS options,
+ [out] DWORD *processid);
+ HRESULT ActivateForFile([in] LPCWSTR appusermodelid,
+ [in] IShellItemArray *itemarray,
+ [in, unique] LPCWSTR verb,
+ [out] DWORD *processid);
+ HRESULT ActivateForProtocol([in] LPCWSTR appusermodelid,
+ [in] IShellItemArray *itemarray,
+ [out] DWORD *processid);
+}
+
/*****************************************************************************
* ShellObjects typelibrary
*/
@@ -3817,4 +3846,12 @@ library ShellObjects
{
interface IQueryCancelAutoPlay;
}
+
+ [
+ uuid(45ba127d-10a8-46ea-8ab7-56ea9078943c)
+ ]
+ coclass ApplicationActivationManager
+ {
+ interface IApplicationActivationManager;
+ }
}
--
1.9.1

41
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "540c48b91175b11c7b8646d0a036b20c46425080"
echo "7f955f22d317cad1e7d5323179e9a0ee635c9768"
}
# Show version information
@ -313,7 +313,6 @@ patch_enable_all ()
enable_shdocvw_ParseURLFromOutsideSource_Tests="$1"
enable_shell32_ACE_Viewer="$1"
enable_shell32_Context_Menu="$1"
enable_shell32_File_Property_Dialog="$1"
enable_shell32_Microsoft_Windows_Themes="$1"
enable_shell32_NewMenu_Interface="$1"
enable_shell32_Placeholder_Icons="$1"
@ -1127,9 +1126,6 @@ patch_enable ()
shell32-Context_Menu)
enable_shell32_Context_Menu="$2"
;;
shell32-File_Property_Dialog)
enable_shell32_File_Property_Dialog="$2"
;;
shell32-Microsoft_Windows_Themes)
enable_shell32_Microsoft_Windows_Themes="$2"
;;
@ -2003,13 +1999,9 @@ if test "$enable_shell32_SHFileOperation_Win9x" -eq 1; then
fi
if test "$enable_shell32_ACE_Viewer" -eq 1; then
if test "$enable_shell32_File_Property_Dialog" -gt 1; then
abort "Patchset shell32-File_Property_Dialog disabled, but shell32-ACE_Viewer depends on that."
fi
if test "$enable_shell32_Progress_Dialog" -gt 1; then
abort "Patchset shell32-Progress_Dialog disabled, but shell32-ACE_Viewer depends on that."
fi
enable_shell32_File_Property_Dialog=1
enable_shell32_Progress_Dialog=1
fi
@ -4180,7 +4172,7 @@ fi
# | * [#34372] Support for AllocateAndGetTcpExTableFromStack
# |
# | Modified files:
# | * dlls/iphlpapi/iphlpapi.spec, dlls/iphlpapi/ipstats.c, dlls/iphlpapi/ipstats.h
# | * dlls/iphlpapi/iphlpapi.spec, dlls/iphlpapi/ipstats.c, include/iphlpapi.h
# |
if test "$enable_iphlpapi_TCP_Table" -eq 1; then
patch_apply iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch
@ -4270,6 +4262,10 @@ fi
# Patchset kernel32-Debugger
# |
# | This patchset fixes the following Wine bugs:
# | * [#35928] Crash handlers/debuggers fail to display user-interface when invoked for crashing (non-interactive) service
# | processes (inherited Wine service window station/desktop)
# |
# | Modified files:
# | * dlls/kernel32/except.c
# |
@ -5249,15 +5245,11 @@ fi
# Patchset ntdll-RtlQueryPackageIdentity
# |
# | Modified files:
# | * dlls/ntdll/ntdll.spec, dlls/ntdll/rtl.c, dlls/ntdll/tests/Makefile.in, dlls/ntdll/tests/rtl.c, include/shobjidl.idl
# | * dlls/ntdll/tests/Makefile.in, dlls/ntdll/tests/rtl.c
# |
if test "$enable_ntdll_RtlQueryPackageIdentity" -eq 1; then
patch_apply ntdll-RtlQueryPackageIdentity/0001-ntdll-Add-stub-for-RtlQueryPackageIdentity.patch
patch_apply ntdll-RtlQueryPackageIdentity/0002-include-Add-IApplicationActivationManager-interface-.patch
patch_apply ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch
(
printf '%s\n' '+ { "Michael Müller", "ntdll: Add stub for RtlQueryPackageIdentity.", 1 },';
printf '%s\n' '+ { "Michael Müller", "include: Add IApplicationActivationManager interface declaration.", 1 },';
printf '%s\n' '+ { "Michael Müller", "ntdll/tests: Add basic tests for RtlQueryPackageIdentity.", 1 },';
) >> "$patchlist"
fi
@ -6568,21 +6560,6 @@ if test "$enable_shdocvw_ParseURLFromOutsideSource_Tests" -eq 1; then
) >> "$patchlist"
fi
# Patchset shell32-File_Property_Dialog
# |
# | This patchset fixes the following Wine bugs:
# | * [#40426] Implement general tab for file property dialog
# |
# | Modified files:
# | * dlls/shell32/shell32.rc, dlls/shell32/shlview_cmenu.c, dlls/shell32/shresdef.h
# |
if test "$enable_shell32_File_Property_Dialog" -eq 1; then
patch_apply shell32-File_Property_Dialog/0001-shell32-Add-general-tab-in-file-property-dialog.patch
(
printf '%s\n' '+ { "Michael Müller", "shell32: Add general tab in file property dialog.", 1 },';
) >> "$patchlist"
fi
# Patchset shell32-SHFileOperation_Move
# |
# | This patchset fixes the following Wine bugs:
@ -6622,8 +6599,8 @@ fi
# Patchset shell32-ACE_Viewer
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * shell32-File_Property_Dialog, server-File_Permissions, ntdll-FileDispositionInformation, kernel32-CopyFileEx,
# | shell32-SHFileOperation_Move, shell32-Progress_Dialog
# | * server-File_Permissions, ntdll-FileDispositionInformation, kernel32-CopyFileEx, shell32-SHFileOperation_Move,
# | shell32-Progress_Dialog
# |
# | Modified files:
# | * dlls/aclui/Makefile.in, dlls/aclui/aclui.rc, dlls/aclui/aclui_main.c, dlls/aclui/resource.h, dlls/aclui/user_icons.bmp,

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

@ -1,4 +1,4 @@
From 4bfacb4f36a83c5b9cd5826742da89d305d1c1b3 Mon Sep 17 00:00:00 2001
From 10282216ac965075a8bf43734bfdaabd24fedf25 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: shell32: Add security property tab.
@ -11,7 +11,7 @@ Subject: 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 b12d6169fb5..fd0b49a26d7 100644
index 970ecba..d6d6eca 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
@ -24,10 +24,10 @@ index b12d6169fb5..fd0b49a26d7 100644
EXTRALIBS = $(CORESERVICES_LIBS)
# AUTHORS file is in the top-level directory
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index e11002db92e..11deef73f93 100644
index 826e291..d7129b6 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -205,6 +205,33 @@ the folder?"
@@ -204,6 +204,33 @@ the folder?"
IDS_RUNDLG_BROWSE_FILTER_EXE "Executable files (*.exe)"
IDS_RUNDLG_BROWSE_FILTER_ALL "All files (*.*)"
@ -62,19 +62,22 @@ index e11002db92e..11deef73f93 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 50b4da11014..7545c598b39 100644
index fc761e1..0bdb85e 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -40,9 +40,128 @@
@@ -39,12 +39,131 @@
#include "shresdef.h"
#include "shlwapi.h"
+#include "aclui.h"
+#include "aclapi.h"
+
#include "wine/heap.h"
#include "wine/debug.h"
+/* Small hack: We need to remove DECLSPEC_HIDDEN from the aclui export. */
+const GUID IID_ISecurityInformation = {0x965fc360, 0x16ff, 0x11d0, {0x91, 0xcb, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x23}};
+
WINE_DEFAULT_DEBUG_CHANNEL(shell);
+/* According to https://blogs.msdn.microsoft.com/oldnewthing/20070726-00/?p=25833 */
@ -194,8 +197,8 @@ index 50b4da11014..7545c598b39 100644
typedef struct
{
IContextMenu3 IContextMenu3_iface;
@@ -684,6 +803,269 @@ error:
HeapFree(GetProcessHeap(), 0, props);
@@ -615,6 +734,269 @@ error:
heap_free(props);
}
+static HRESULT WINAPI filesecurity_QueryInterface(ISecurityInformation *iface, REFIID riid, void **ppv)
@ -464,16 +467,16 @@ index 50b4da11014..7545c598b39 100644
#define MAX_PROP_PAGES 99
static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -766,6 +1148,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
if (SUCCEEDED(ret))
{
init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);
+ init_security_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);
@@ -697,6 +1079,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
if (SUCCEEDED(ret))
{
init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);
+ init_security_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);
hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo);
if (hpsxa != NULL)
hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo);
if (hpsxa != NULL)
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index 1445077b86e..974da3c7ab5 100644
index ed76ac8..26fc4cd 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -157,6 +157,33 @@
@ -511,5 +514,5 @@ index 1445077b86e..974da3c7ab5 100644
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
--
2.12.2
2.7.4

1
patches/shell32-ACE_Viewer/definition
View File

@ -1,3 +1,2 @@
Fixes: Implement a basic security property tab
Depends: shell32-Progress_Dialog
Depends: shell32-File_Property_Dialog

509
patches/shell32-File_Property_Dialog/0001-shell32-Add-general-tab-in-file-property-dialog.patch
View File

File diff suppressed because it is too large Load Diff

1
patches/shell32-File_Property_Dialog/definition
View File

@ -1 +0,0 @@
Fixes: [40426] Implement general tab for file property dialog