Updated mailing-list-patches patchset

This commit is contained in:
Alistair Leslie-Hughes 2019-07-12 09:00:06 +10:00
parent 5ed9211eab
commit 6e530333e6
6 changed files with 389 additions and 11 deletions

View File

@ -1,20 +1,33 @@
From 43d1b91c72b4151422bfd642ddf538f71935a78b Mon Sep 17 00:00:00 2001
From 39c92b48498d080c4d90e9b8d16c580dd72b1941 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 5 Jul 2019 13:20:23 +0800
Subject: [PATCH] cryptext: Implement CryptExtOpenCER.
Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
---
configure | 1 +
configure.ac | 1 +
dlls/cryptext/Makefile.in | 3 +-
dlls/cryptext/cryptext.spec | 4 +--
dlls/cryptext/cryptext_main.c | 64 +++++++++++++++++++++++++++++++++
dlls/cryptext/tests/Makefile.in | 4 +++
dlls/cryptext/tests/cryptext.c | 61 +++++++++++++++++++++++++++++++
6 files changed, 134 insertions(+), 3 deletions(-)
7 files changed, 135 insertions(+), 3 deletions(-)
create mode 100644 dlls/cryptext/tests/Makefile.in
create mode 100644 dlls/cryptext/tests/cryptext.c
diff --git a/configure b/configure
index f1de2c4052..ed79a35e0e 100755
--- a/configure
+++ b/configure
@@ -20063,6 +20063,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg
wine_fn_config_makefile dlls/cryptdll enable_cryptdll
wine_fn_config_makefile dlls/cryptext enable_cryptext
+wine_fn_config_makefile dlls/cryptext/tests enable_tests
wine_fn_config_makefile dlls/cryptnet enable_cryptnet
wine_fn_config_makefile dlls/cryptnet/tests enable_tests
wine_fn_config_makefile dlls/cryptui enable_cryptui
diff --git a/configure.ac b/configure.ac
index a7c45ace73..e801c35c46 100644
--- a/configure.ac

View File

@ -0,0 +1,212 @@
From 093aa67fd84f2709e8f358d32e3c5c2348836225 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Thu, 11 Jul 2019 14:23:43 -0500
Subject: [PATCH 1/4] mscorwks: New DLL.
Game Maker Studio 2 Desktop needs this to launch.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
configure | 2 +
configure.ac | 1 +
dlls/mscorwks/Makefile.in | 1 +
dlls/mscorwks/mscorwks.spec | 110 ++++++++++++++++++++++++++++++++++++
loader/wine.inf.in | 2 +
tools/make_specfiles | 4 ++
6 files changed, 120 insertions(+)
create mode 100644 dlls/mscorwks/Makefile.in
create mode 100644 dlls/mscorwks/mscorwks.spec
diff --git a/configure b/configure
index ed79a35e0e..76d4869332 100755
--- a/configure
+++ b/configure
@@ -1404,6 +1404,7 @@ enable_msasn1
enable_mscat32
enable_mscms
enable_mscoree
+enable_mscorwks
enable_msctf
enable_msctfp
enable_msdaps
@@ -20406,6 +20407,7 @@ wine_fn_config_makefile dlls/mscms enable_mscms
wine_fn_config_makefile dlls/mscms/tests enable_tests
wine_fn_config_makefile dlls/mscoree enable_mscoree
wine_fn_config_makefile dlls/mscoree/tests enable_tests
+wine_fn_config_makefile dlls/mscorwks enable_mscorwks
wine_fn_config_makefile dlls/msctf enable_msctf
wine_fn_config_makefile dlls/msctf/tests enable_tests
wine_fn_config_makefile dlls/msctfp enable_msctfp
diff --git a/configure.ac b/configure.ac
index e801c35c46..4b825a9b8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3392,6 +3392,7 @@ WINE_CONFIG_MAKEFILE(dlls/mscms)
WINE_CONFIG_MAKEFILE(dlls/mscms/tests)
WINE_CONFIG_MAKEFILE(dlls/mscoree)
WINE_CONFIG_MAKEFILE(dlls/mscoree/tests)
+WINE_CONFIG_MAKEFILE(dlls/mscorwks)
WINE_CONFIG_MAKEFILE(dlls/msctf)
WINE_CONFIG_MAKEFILE(dlls/msctf/tests)
WINE_CONFIG_MAKEFILE(dlls/msctfp)
diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in
new file mode 100644
index 0000000000..4527266171
--- /dev/null
+++ b/dlls/mscorwks/Makefile.in
@@ -0,0 +1 @@
+MODULE = mscorwks.dll
diff --git a/dlls/mscorwks/mscorwks.spec b/dlls/mscorwks/mscorwks.spec
new file mode 100644
index 0000000000..617cde3173
--- /dev/null
+++ b/dlls/mscorwks/mscorwks.spec
@@ -0,0 +1,110 @@
+@ stdcall LoadStringRC(long ptr long long) mscoree.LoadStringRC
+@ stub ReOpenMetaDataWithMemory
+@ stub CorDllMainForThunk
+@ stub CreateActContextInternal
+@ stub CreateCMSFromXmlInternal
+@ stub GetAddrOfContractShutoffFlag
+@ stub GetCLRFunction
+@ stub GetUserStateManagerInternal
+@ stub GetUserStoreInternal
+@ stub ParseManifestInternal
+@ stub _AxlGetIssuerPublicKeyHash
+@ stub _AxlPublicKeyBlobToPublicKeyToken
+@ stub _AxlRSAKeyValueToPublicKeyToken
+@ stub CertCreateAuthenticodeLicense
+@ stub CertFreeAuthenticodeSignerInfo
+@ stub CertFreeAuthenticodeTimestamperInfo
+@ stub CertTimestampAuthenticodeLicense
+@ stub CertVerifyAuthenticodeLicense
+@ stub ClearDownloadCache
+@ stdcall ClrCreateManagedInstance(wstr ptr ptr) mscoree.ClrCreateManagedInstance
+@ stdcall CoEEShutDownCOM() mscoree.CoEEShutDownCOM
+@ stdcall CoInitializeCor(long) mscoree.CoInitializeCor
+@ stub CoInitializeEE
+@ stub CoUninitializeCor
+@ stub CoUninitializeEE
+@ stub CompareAssemblyIdentity
+@ stub CopyPDBs
+@ stdcall CorExitProcess(long) mscoree.CorExitProcess
+@ stub CorLaunchApplication
+@ stub CorMarkThreadInThreadPool
+@ stub CreateActContext
+@ stub CreateApplicationContext
+@ stub CreateAssemblyCache
+@ stub CreateAssemblyEnum
+@ stub CreateAssemblyNameObject
+@ stub CreateCMSFromXml
+@ stub CreateHistoryReader
+@ stub CreateInstallReferenceEnum
+@ stub DeleteShadowCache
+@ stub DllCanUnloadNowInternal
+@ stub DllGetClassObjectInternal
+@ stub DllRegisterServerInternal
+@ stub DllUnregisterServerInternal
+@ stub EEDllRegisterServer
+@ stub EEDllUnregisterServer
+@ stub GetAppIdAuthority
+@ stub GetAssemblyIdentityFromFile
+@ stdcall GetAssemblyMDImport(wstr ptr ptr) mscoree.GetAssemblyMDImport
+@ stub GetCLRIdentityManager
+@ stub GetCachePath
+@ stub GetHashFromAssemblyFile
+@ stub GetHashFromAssemblyFileW
+@ stub GetHashFromBlob
+@ stub GetHashFromFile
+@ stub GetHashFromFileW
+@ stub GetHashFromHandle
+@ stub GetHistoryFileDirectory
+@ stub GetIdentityAuthority
+@ stub GetMetaDataInternalInterface
+@ stub GetMetaDataInternalInterfaceFromPublic
+@ stub GetMetaDataPublicInterfaceFromInternal
+@ stub GetPermissionRequests
+@ stub GetPrivateContextsPerfCounters
+@ stub GetUserStateManager
+@ stub GetUserStore
+@ stub IEE
+@ stub InitializeFusion
+@ stub InstallCustomAssembly
+@ stub InstallCustomModule
+@ stub LegacyNGenCompile
+@ stub LegacyNGenCreateZapper
+@ stub LegacyNGenFreeZapper
+@ stub LegacyNGenTryEnumerateFusionCache
+@ stdcall LoadStringRCEx(long long ptr long long ptr) mscoree.LoadStringRCEx
+@ stub LogHelp_LogAssert
+@ stub LogHelp_NoGuiOnAssert
+@ stub LogHelp_TerminateOnAssert
+@ stub LookupHistoryAssembly
+@ stub MetaDataGetDispenser
+@ stub NGenCreateNGenWorker
+@ stub NukeDownloadedCache
+@ stub ParseManifest
+@ stub PostErrorVA
+@ stub PreBindAssembly
+@ stub PreBindAssemblyEx
+@ stub ReOpenMetaDataWithMemoryEx
+@ stub StrongNameCompareAssemblies
+@ stub StrongNameErrorInfo
+@ stub StrongNameFreeBuffer
+@ stub StrongNameGetBlob
+@ stub StrongNameGetBlobFromImage
+@ stub StrongNameGetPublicKey
+@ stub StrongNameHashSize
+@ stub StrongNameKeyDelete
+@ stub StrongNameKeyGen
+@ stub StrongNameKeyGenEx
+@ stub StrongNameKeyInstall
+@ stub StrongNameSignatureGeneration
+@ stub StrongNameSignatureGenerationEx
+@ stub StrongNameSignatureSize
+@ stdcall StrongNameSignatureVerification(wstr long ptr) mscoree.StrongNameSignatureVerification
+@ stdcall StrongNameSignatureVerificationEx(wstr long ptr) mscoree.StrongNameSignatureVerificationEx
+@ stub StrongNameSignatureVerificationFromImage
+@ stub StrongNameTokenFromAssembly
+@ stub StrongNameTokenFromAssemblyEx
+@ stub StrongNameTokenFromPublicKey
+@ stub TranslateSecurityAttributes
+@ stdcall _CorDllMain(long long ptr) mscoree._CorDllMain
+@ stdcall _CorExeMain2(ptr long ptr ptr ptr) mscoree._CorExeMain2
+@ stdcall _CorExeMain() mscoree._CorExeMain
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index c3d3b770b5..2ac524afdb 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,aspnet_regiis.exe,-
11,,ngen.exe,-
11,,fusion.dll,-
+11,,mscorwks.dll,-
11,,regsvcs.exe,-
11,,regasm.exe,-
11,,servicemodelreg.exe,-
@@ -2603,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,aspnet_regiis.exe,-
11,,ngen.exe,-
11,,fusion.dll,-
+11,,mscorwks.dll,-
11,,regsvcs.exe,-
11,,regasm.exe,-
11,,servicemodelreg.exe,-
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 64c25d1259..5c30ce5003 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -483,6 +483,10 @@ my @dll_groups =
"ntoskrnl.exe",
"hal",
],
+ [
+ "mscoree",
+ "mscorwks",
+ ],
);
my $update_flags = 0;
--
2.17.1

View File

@ -0,0 +1,72 @@
From fbbee6b2920811ce7e0cbffeb1c5d1e81e7edffb Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Thu, 11 Jul 2019 14:23:44 -0500
Subject: [PATCH] include: Add strongname.h.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
include/Makefile.in | 1 +
include/strongname.h | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
create mode 100644 include/strongname.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 69135879a9..7ca25e27ce 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -612,6 +612,7 @@ SOURCES = \
sti.h \
storage.h \
strmif.idl \
+ strongname.h \
strsafe.h \
structuredquerycondition.idl \
svrapi.h \
diff --git a/include/strongname.h b/include/strongname.h
new file mode 100644
index 0000000000..f05861ad28
--- /dev/null
+++ b/include/strongname.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2019 Zebediah Figura for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __STRONG_NAME_H
+#define __STRONG_NAME_H
+
+#include <windows.h>
+#include <wincrypt.h>
+#include <ole2.h>
+#include <corerror.h>
+
+#define SN_INFLAG_FORCE_VER 0x00000001
+#define SN_INFLAG_INSTALL 0x00000002
+#define SN_INFLAG_ADMIN_ACCESS 0x00000004
+#define SN_INFLAG_USER_ACCESS 0x00000008
+#define SN_INFLAG_ALL_ACCESS 0x00000010
+#define SN_INFLAG_RUNTIME 0x80000000
+
+#define SN_OUTFLAG_WAS_VERIFIED 0x00000001
+
+BOOLEAN __stdcall StrongNameSignatureVerification(const WCHAR *path, DWORD flags, DWORD *ret_flags);
+BOOLEAN __stdcall StrongNameSignatureVerificationEx(const WCHAR *path, BOOLEAN force, BOOLEAN *verified);
+
+#endif
--
2.17.1

View File

@ -0,0 +1,42 @@
From 27158684d1c82dc156fb3a72d18a845a31f9e693 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Thu, 11 Jul 2019 14:23:45 -0500
Subject: [PATCH 3/4] mscoree: Fix the signature for
StrongNameSignatureVerification[Ex]().
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
dlls/mscoree/mscoree_main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index 15bbc23520..6afeafe8f0 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -30,6 +30,7 @@
#include "ole2.h"
#include "ocidl.h"
#include "shellapi.h"
+#include "strongname.h"
#include "initguid.h"
#include "msxml2.h"
@@ -548,13 +549,13 @@ STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject)
return ret;
}
-BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags)
+BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD *pOutFlags)
{
FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags);
return FALSE;
}
-BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerification, BOOL* pVerified)
+BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified)
{
FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified);
return FALSE;
--
2.17.1

View File

@ -0,0 +1,30 @@
From e00b7bc899009c839947e30444c2a9a12b83c033 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Thu, 11 Jul 2019 14:23:46 -0500
Subject: [PATCH 4/4] mscoree: Fake success from
StrongNameSignatureVerificationEx().
Game Maker Studio 2 Desktop needs this to launch.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
dlls/mscoree/mscoree_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index 6afeafe8f0..af0321a760 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -558,7 +558,8 @@ BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags,
BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified)
{
FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified);
- return FALSE;
+ *pVerified = TRUE;
+ return TRUE;
}
HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv)
--
2.17.1

View File

@ -2063,15 +2063,16 @@ fi
# Patchset mailing-list-patches
# |
# | Modified files:
# | * configure.ac, dlls/cryptext/Makefile.in, dlls/cryptext/cryptext.spec, dlls/cryptext/cryptext_main.c,
# | * configure, configure.ac, dlls/cryptext/Makefile.in, dlls/cryptext/cryptext.spec, dlls/cryptext/cryptext_main.c,
# | dlls/cryptext/tests/Makefile.in, dlls/cryptext/tests/cryptext.c, dlls/d3drm/tests/d3drm.c, dlls/d3drm/viewport.c,
# | dlls/dxgi/swapchain.c, dlls/dxgi/tests/dxgi.c, dlls/evr/Makefile.in, dlls/evr/evr.c, dlls/evr/main.c,
# | dlls/gdi32/freetype.c, dlls/ntdll/directory.c, dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl_private.h,
# | dlls/ntoskrnl.exe/pnp.c, dlls/qedit/Makefile.in, dlls/shell32/shell32.spec, dlls/shell32/shlfileop.c,
# | dlls/strmbase/strmbase_private.h, dlls/user32/rawinput.c, dlls/user32/tests/input.c, dlls/winebus.sys/bus.h,
# | dlls/winebus.sys/bus_iohid.c, dlls/winebus.sys/bus_sdl.c, dlls/winebus.sys/bus_udev.c, dlls/winebus.sys/main.c,
# | include/d3drm.h, include/d3drmobj.h, loader/Makefile.in, loader/wine.inf.in, loader/winebus.inf.in,
# | programs/wineboot/Makefile.in, programs/wineboot/wineboot.c
# | dlls/gdi32/freetype.c, dlls/mscoree/mscoree_main.c, dlls/mscorwks/Makefile.in, dlls/mscorwks/mscorwks.spec,
# | dlls/ntdll/directory.c, dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl_private.h, dlls/ntoskrnl.exe/pnp.c,
# | dlls/qedit/Makefile.in, dlls/shell32/shell32.spec, dlls/shell32/shlfileop.c, dlls/strmbase/strmbase_private.h,
# | dlls/user32/rawinput.c, dlls/user32/tests/input.c, dlls/winebus.sys/bus.h, dlls/winebus.sys/bus_iohid.c,
# | dlls/winebus.sys/bus_sdl.c, dlls/winebus.sys/bus_udev.c, dlls/winebus.sys/main.c, include/Makefile.in, include/d3drm.h,
# | include/d3drmobj.h, include/strongname.h, loader/Makefile.in, loader/wine.inf.in, loader/winebus.inf.in,
# | programs/wineboot/Makefile.in, programs/wineboot/wineboot.c, tools/make_specfiles
# |
if test "$enable_mailing_list_patches" -eq 1; then
patch_apply mailing-list-patches/0001-winebus.inf-Add-new-INF-file-and-copy-it-to-the-INF-.patch
@ -2096,6 +2097,10 @@ if test "$enable_mailing_list_patches" -eq 1; then
patch_apply mailing-list-patches/0020-winebus.sys-Report-the-native-product-string-for-som.patch
patch_apply mailing-list-patches/0021-Define-AT_NO_AUTOMOUNT-if-needed.patch
patch_apply mailing-list-patches/0022-gdi32-Use-the-correct-type-for-the-final-parameter-o.patch
patch_apply mailing-list-patches/0023-mscorwks-New-DLL.patch
patch_apply mailing-list-patches/0024-include-Add-strongname.h.patch
patch_apply mailing-list-patches/0025-mscoree-Fix-the-signature-for-StrongNameSignatureVer.patch
patch_apply mailing-list-patches/0026-mscoree-Fake-success-from-StrongNameSignatureVerific.patch
(
printf '%s\n' '+ { "Zebediah Figura", "winebus.inf: Add new INF file and copy it to the INF directory.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "winebus.sys: Implement AddDevice().", 1 },';
@ -2119,6 +2124,10 @@ if test "$enable_mailing_list_patches" -eq 1; then
printf '%s\n' '+ { "Rémi Bernon", "winebus.sys: Report the native product string for some Xbox gamepads.", 1 },';
printf '%s\n' '+ { "Gabriel Ivăncescu", "Define AT_NO_AUTOMOUNT if needed.", 1 },';
printf '%s\n' '+ { "Huw Davies", "gdi32: Use the correct type for the final parameter of FSOpenResourceFile().", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "mscorwks: New DLL.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "include: Add strongname.h.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "mscoree: Fix the signature for StrongNameSignatureVerification[Ex]().", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "mscoree: Fake success from StrongNameSignatureVerificationEx().", 1 },';
) >> "$patchlist"
fi
@ -6579,7 +6588,7 @@ fi
# | * [#17823] Assign a drive serial number during prefix creation/update
# |
# | Modified files:
# | * programs/wineboot/Makefile.in, programs/wineboot/wineboot.c
# | * programs/wineboot/wineboot.c
# |
if test "$enable_wineboot_DriveSerial" -eq 1; then
patch_apply wineboot-DriveSerial/0001-wineboot-Assign-a-drive-serial-number-during-prefix-.patch
@ -6627,7 +6636,7 @@ fi
# | * [#42024] Create ProxyEnable key on wineprefix update
# |
# | Modified files:
# | * programs/wineboot/wineboot.c
# | * programs/wineboot/Makefile.in, programs/wineboot/wineboot.c
# |
if test "$enable_wineboot_ProxySettings" -eq 1; then
patch_apply wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch