From 09fdb3b5c97df1b96389f8070fd791560ec670b4 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 22 Mar 2021 18:18:10 -0500 Subject: [PATCH] Rebase against d1764a45cfd12f8c5699fd7428cf90f90a2d31ef. Actually rebase this time. --- patches/patchinstall.sh | 2 +- ...0002-shell32-Add-security-property-tab.patch | 10 +++++----- ...r-Create-desktop-shortcuts-with-absolu.patch | 17 +++++++++-------- ...-fetch-actual-program-name-if-possible.patch | 16 ++++++++-------- ...port-ole32-msacm32-to-workaround-bug-w.patch | 8 ++++---- ...al-implementation-of-WTSEnumerateProce.patch | 16 ++++++++-------- staging/upstream-commit | 2 +- 7 files changed, 36 insertions(+), 35 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 056af819..bfe2494c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "41df83c50e1c3cfdd6e8ffb65de7838f8503632c" + echo "d1764a45cfd12f8c5699fd7428cf90f90a2d31ef" } # Show version information diff --git a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch index 35cb1df0..b46a400f 100644 --- a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch +++ b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch @@ -1,4 +1,4 @@ -From 7865341c5b4e465ec027e8da439773bf3619a4f7 Mon Sep 17 00:00:00 2001 +From 34e55c92e6deace0326f436c2c935bf2827510e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= 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 fe49bf09f98..f6fcf2e18eb 100644 +index e89177c3a73..6be1631a05a 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,7 +1,7 @@ - EXTRADEFS = -D_SHELL32_ + EXTRADEFS = -D_SHELL32_ -DWINE_NO_NAMELESS_EXTENSION MODULE = shell32.dll IMPORTLIB = shell32 -IMPORTS = uuid shlwapi user32 gdi32 advapi32 @@ -24,7 +24,7 @@ index fe49bf09f98..f6fcf2e18eb 100644 # AUTHORS file is in the top-level directory EXTRAINCL = -I$(top_srcdir) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index 8739718f715..fb890a5953b 100644 +index 1324a5449a3..3fc9d205c25 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -204,6 +204,33 @@ the folder?" @@ -514,5 +514,5 @@ index 33edb584c1b..e2211024cc3 100644 #define IDS_RECYCLEBIN_FOLDER_NAME 8964 -- -2.17.1 +2.30.2 diff --git a/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch b/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch index 2424a749..46cd87b5 100644 --- a/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch +++ b/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch @@ -1,4 +1,4 @@ -From 730dc1618045e8da4b9c825db04d640c48bb99dd Mon Sep 17 00:00:00 2001 +From 3f27a55d9b324a1e7574428f4dec9fe7997f9f39 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 24 Sep 2014 21:13:59 +0200 Subject: [PATCH] winemenubuilder: Create desktop shortcuts with absolute wine @@ -10,24 +10,25 @@ changes the behaviour to use the absolute wine path in desktop shortcuts. The pa behaviour on Linux, because some other distros are a bit special (FreeBSD requires a wrapper to start wine, and so on ...). --- - programs/winemenubuilder/Makefile.in | 1 + + programs/winemenubuilder/Makefile.in | 2 +- programs/winemenubuilder/winemenubuilder.c | 21 +++++++++++++++------ - 2 files changed, 16 insertions(+), 6 deletions(-) + 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in -index 07e2702843..a4e28adc4b 100644 +index 3cca593462b..ae5c53adf46 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in -@@ -1,6 +1,7 @@ +@@ -1,7 +1,7 @@ MODULE = winemenubuilder.exe APPMODE = -mwindows -municode IMPORTS = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32 -+EXTRADEFS = -DBINDIR="\"${bindir}\"" +-EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION ++EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION -DBINDIR="\"${bindir}\"" C_SRCS = \ winemenubuilder.c diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c -index ee53619bb9..d80b94767e 100644 +index fe4998fb373..869bf8bece9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -106,6 +106,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); @@ -77,5 +78,5 @@ index ee53619bb9..d80b94767e 100644 fprintf(desktop, "StartupNotify=true\n"); if (openWithIcon) -- -2.27.0 +2.30.2 diff --git a/patches/winepulse-PulseAudio_Support/0006-winepulse-fetch-actual-program-name-if-possible.patch b/patches/winepulse-PulseAudio_Support/0006-winepulse-fetch-actual-program-name-if-possible.patch index 11b493aa..1ef52c58 100644 --- a/patches/winepulse-PulseAudio_Support/0006-winepulse-fetch-actual-program-name-if-possible.patch +++ b/patches/winepulse-PulseAudio_Support/0006-winepulse-fetch-actual-program-name-if-possible.patch @@ -1,4 +1,4 @@ -From 8cfb9cdbf9448fbd2234a52ff69ac2921702996c Mon Sep 17 00:00:00 2001 +From dfd56158947fe9f032d738f586fba49276a6eccc Mon Sep 17 00:00:00 2001 From: Mark Harmstone Date: Sun, 21 Dec 2014 23:49:41 +0000 Subject: [PATCH] winepulse: fetch actual program name if possible @@ -14,7 +14,7 @@ Changes by Sebastian Lackner : 2 files changed, 117 insertions(+), 9 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in -index d6600632360..2448789dedf 100644 +index 3082ed8a69e..16bf0ab21c9 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -1,5 +1,5 @@ @@ -23,12 +23,12 @@ index d6600632360..2448789dedf 100644 +IMPORTS = dxguid uuid winmm user32 advapi32 ole32 version EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(PULSE_CFLAGS) - + EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c -index 510797a2edc..46f20ce419d 100644 +index 403d025d43f..f18242e8505 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c -@@ -43,6 +43,7 @@ +@@ -44,6 +44,7 @@ #include "wine/list.h" #include "ole2.h" @@ -36,7 +36,7 @@ index 510797a2edc..46f20ce419d 100644 #include "dshow.h" #include "dsound.h" #include "propsys.h" -@@ -559,6 +560,109 @@ static void pulse_probe_settings(pa_mainloop *ml, pa_context *ctx, int render, W +@@ -560,6 +561,109 @@ static void pulse_probe_settings(pa_mainloop *ml, pa_context *ctx, int render, W fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; } @@ -146,7 +146,7 @@ index 510797a2edc..46f20ce419d 100644 static HRESULT pulse_connect(void) { int len; -@@ -582,14 +686,18 @@ static HRESULT pulse_connect(void) +@@ -583,14 +687,18 @@ static HRESULT pulse_connect(void) pa_context_unref(pulse_ctx); GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); @@ -174,5 +174,5 @@ index 510797a2edc..46f20ce419d 100644 pulse_ctx = pa_context_new(pa_mainloop_get_api(pulse_ml), str); pa_xfree(str); -- -2.17.1 +2.30.2 diff --git a/patches/winmm-Delay_Import_Depends/0001-winmm-Delay-import-ole32-msacm32-to-workaround-bug-w.patch b/patches/winmm-Delay_Import_Depends/0001-winmm-Delay-import-ole32-msacm32-to-workaround-bug-w.patch index 5486e88a..5979f3b7 100644 --- a/patches/winmm-Delay_Import_Depends/0001-winmm-Delay-import-ole32-msacm32-to-workaround-bug-w.patch +++ b/patches/winmm-Delay_Import_Depends/0001-winmm-Delay-import-ole32-msacm32-to-workaround-bug-w.patch @@ -1,4 +1,4 @@ -From ce22b00ff42b914d27e8741d51b1fe8d6e98c2e0 Mon Sep 17 00:00:00 2001 +From 62f86ec9c49ad942bec43d99299d12ee0834fc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 31 Jan 2015 06:00:38 +0100 Subject: [PATCH] winmm: Delay import ole32 msacm32 to workaround bug when @@ -9,11 +9,11 @@ Subject: [PATCH] winmm: Delay import ole32 msacm32 to workaround bug when 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in -index c05115d5c58..2b3bcf92d9a 100644 +index d003a53afe4..80fd74201d6 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,7 +1,8 @@ - EXTRADEFS = -D_WINMM_ + EXTRADEFS = -D_WINMM_ -DWINE_NO_NAMELESS_EXTENSION MODULE = winmm.dll IMPORTLIB = winmm -IMPORTS = uuid user32 advapi32 ole32 msacm32 @@ -23,5 +23,5 @@ index c05115d5c58..2b3bcf92d9a 100644 EXTRADLLFLAGS = -mno-cygwin -- -2.20.1 +2.30.2 diff --git a/patches/wtsapi32-EnumerateProcesses/0001-wtsapi32-Partial-implementation-of-WTSEnumerateProce.patch b/patches/wtsapi32-EnumerateProcesses/0001-wtsapi32-Partial-implementation-of-WTSEnumerateProce.patch index a750bbac..dadac7b7 100644 --- a/patches/wtsapi32-EnumerateProcesses/0001-wtsapi32-Partial-implementation-of-WTSEnumerateProce.patch +++ b/patches/wtsapi32-EnumerateProcesses/0001-wtsapi32-Partial-implementation-of-WTSEnumerateProce.patch @@ -1,4 +1,4 @@ -From 3e86366ed3ab3aca555d2457e930cf7dbd08a105 Mon Sep 17 00:00:00 2001 +From 5befee66603e60c0fee60e06805346e0e165131d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 22 Jun 2014 19:04:38 +0200 Subject: [PATCH] wtsapi32: Partial implementation of WTSEnumerateProcessesW. @@ -9,10 +9,10 @@ Subject: [PATCH] wtsapi32: Partial implementation of WTSEnumerateProcessesW. 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c -index c9312cd97c5..72b57c16ffa 100644 +index 8ce1dc8bf9c..54bb3b70e6e 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c -@@ -85,7 +85,6 @@ static void test_WTSEnumerateProcessesW(void) +@@ -86,7 +86,6 @@ static void test_WTSEnumerateProcessesW(void) { found = found || !lstrcmpW(pname, info[i].pProcessName); } @@ -21,7 +21,7 @@ index c9312cd97c5..72b57c16ffa 100644 WTSFreeMemory(info); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c -index ef3e0d10a0f..06ce384a337 100644 +index a5c9bf6519f..ac7fc765779 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -17,8 +17,11 @@ @@ -34,9 +34,9 @@ index ef3e0d10a0f..06ce384a337 100644 #include "winbase.h" +#include "winternl.h" #include "winnls.h" + #include "lmcons.h" #include "wtsapi32.h" - #include "wine/debug.h" -@@ -115,8 +118,13 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version +@@ -116,8 +119,13 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version, PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) { @@ -52,7 +52,7 @@ index ef3e0d10a0f..06ce384a337 100644 if (!ppProcessInfo || !pCount || Reserved != 0 || Version != 1) { -@@ -124,9 +132,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version +@@ -125,9 +133,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version return FALSE; } @@ -127,5 +127,5 @@ index ef3e0d10a0f..06ce384a337 100644 } -- -2.26.2 +2.30.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index be1ef33f..4e3dd96a 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -41df83c50e1c3cfdd6e8ffb65de7838f8503632c +d1764a45cfd12f8c5699fd7428cf90f90a2d31ef