mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch to define missing message string for TRUST_E_NOSIGNATURE.
This commit is contained in:
parent
37bc3c21bf
commit
c3167b37c2
@ -0,0 +1,61 @@
|
||||
From 9d5dcc2d2b1087294f16173efba8c381c3292316 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Sat, 23 Sep 2017 01:06:40 +0200
|
||||
Subject: kernel32: add message resource for TRUST_E_NOSIGNATURE
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Based on a patch by Austin English.
|
||||
|
||||
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/kernel32/tests/format_msg.c | 4 ++++
|
||||
dlls/kernel32/winerror.mc | 11 +++++++++++
|
||||
2 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c
|
||||
index 1f88e2465b8..08a35c53cd2 100644
|
||||
--- a/dlls/kernel32/tests/format_msg.c
|
||||
+++ b/dlls/kernel32/tests/format_msg.c
|
||||
@@ -1559,6 +1559,10 @@ static void test_message_from_hmodule(void)
|
||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);
|
||||
ok(ret != 0, "FormatMessageA returned 0\n");
|
||||
|
||||
+ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, TRUST_E_NOSIGNATURE,
|
||||
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);
|
||||
+ ok(ret != 0, "FormatMessageA returned 0\n");
|
||||
+
|
||||
/* Test a message string with an insertion without passing any variadic arguments. */
|
||||
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */,
|
||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);
|
||||
diff --git a/dlls/kernel32/winerror.mc b/dlls/kernel32/winerror.mc
|
||||
index dc17f499b55..141af216ec7 100644
|
||||
--- a/dlls/kernel32/winerror.mc
|
||||
+++ b/dlls/kernel32/winerror.mc
|
||||
@@ -18,6 +18,10 @@
|
||||
|
||||
LanguageNames=(ENU=0x409:winerr)
|
||||
|
||||
+SeverityNames=(CoError=0x2:STATUS_SEVERITY_COERROR)
|
||||
+
|
||||
+FacilityNames=(Trust=0xb:FACILITY_CERT)
|
||||
+
|
||||
MessageId=0
|
||||
SymbolicName=ERROR_SUCCESS
|
||||
Language=ENU
|
||||
@@ -3748,3 +3752,10 @@ SymbolicName=WSAECONNREFUSED
|
||||
Language=ENU
|
||||
Connection refused.
|
||||
.
|
||||
+MessageId=0x100
|
||||
+Severity=CoError
|
||||
+Facility=Trust
|
||||
+SymbolicName=TRUST_E_NOSIGNATURE
|
||||
+Language=ENU
|
||||
+No Signature found in file.
|
||||
+.
|
||||
--
|
||||
2.14.1
|
||||
|
1
patches/kernel32-TRUST_E_NOSIGNATURE/definition
Normal file
1
patches/kernel32-TRUST_E_NOSIGNATURE/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [43041] Add missing message string for TRUST_E_NOSIGNATURE
|
@ -206,6 +206,7 @@ patch_enable_all ()
|
||||
enable_kernel32_Profile="$1"
|
||||
enable_kernel32_SCSI_Sysfs="$1"
|
||||
enable_kernel32_SetFileCompletionNotificationModes="$1"
|
||||
enable_kernel32_TRUST_E_NOSIGNATURE="$1"
|
||||
enable_kernel32_Tests="$1"
|
||||
enable_kernel32_TimezoneInformation_Registry="$1"
|
||||
enable_kernel32_UmsStubs="$1"
|
||||
@ -901,6 +902,9 @@ patch_enable ()
|
||||
kernel32-SetFileCompletionNotificationModes)
|
||||
enable_kernel32_SetFileCompletionNotificationModes="$2"
|
||||
;;
|
||||
kernel32-TRUST_E_NOSIGNATURE)
|
||||
enable_kernel32_TRUST_E_NOSIGNATURE="$2"
|
||||
;;
|
||||
kernel32-Tests)
|
||||
enable_kernel32_Tests="$2"
|
||||
;;
|
||||
@ -5551,6 +5555,21 @@ if test "$enable_kernel32_SetFileCompletionNotificationModes" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-TRUST_E_NOSIGNATURE
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#43041] Add missing message string for TRUST_E_NOSIGNATURE
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/tests/format_msg.c, dlls/kernel32/winerror.mc
|
||||
# |
|
||||
if test "$enable_kernel32_TRUST_E_NOSIGNATURE" -eq 1; then
|
||||
patch_apply kernel32-TRUST_E_NOSIGNATURE/0001-kernel32-add-message-resource-for-TRUST_E_NOSIGNATUR.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Louis Lenders", "kernel32: Add message resource for TRUST_E_NOSIGNATURE.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-Tests
|
||||
# |
|
||||
# | Modified files:
|
||||
|
Loading…
Reference in New Issue
Block a user