mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Revert "Added msasn1-ASN1_CreateModule patchset"
This reverts commit 06ad40cfd0e9739621d70bc2776d87df006eb52d. It come to out attention that FreeRDP may not be a clean source for this patch.
This commit is contained in:
parent
e108b600b5
commit
37de066533
@ -1,96 +0,0 @@
|
||||
From 2eca40657576f5e3e3ad7e4b6b0c7431e6d1509c Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Tue, 27 Oct 2015 15:08:02 -0500
|
||||
Subject: [PATCH] msasn1: implement ASN1_CreateModule
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This is based on code from the FreeRDP project, used with permission
|
||||
of the author, Marc-André Moreau <marcandre.moreau@gmail.com>
|
||||
|
||||
Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=38020
|
||||
Signed-off-by: Austin English <austinenglish@gmail.com>
|
||||
---
|
||||
dlls/msasn1/main.c | 39 +++++++++++++++++++++++++++++++++++++++
|
||||
dlls/msasn1/msasn1.spec | 2 +-
|
||||
2 files changed, 40 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c
|
||||
index 81f246a..ec9d88d 100644
|
||||
--- a/dlls/msasn1/main.c
|
||||
+++ b/dlls/msasn1/main.c
|
||||
@@ -1,5 +1,9 @@
|
||||
/*
|
||||
* Copyright 2014 Austin English
|
||||
+ * Copyright 2015 Marc-André Moreau
|
||||
+ *
|
||||
+ * ASN1_CreateModule based on code from the FreeRDP project, with permission from
|
||||
+ * Marc-André Moreau <marcandre.moreau@gmail.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -22,8 +26,12 @@
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
+#include "wine/debug.h"
|
||||
+
|
||||
#include "msasn1.h"
|
||||
|
||||
+WINE_DEFAULT_DEBUG_CHANNEL(msasn);
|
||||
+
|
||||
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
|
||||
{
|
||||
|
||||
@@ -38,3 +46,34 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
+
|
||||
+ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t version, ASN1encodingrule_e rule, ASN1uint32_t flags, ASN1uint32_t pdu, const ASN1GenericFun_t encoder[], const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freememory[], const ASN1uint32_t size[], ASN1magic_t modulename)
|
||||
+{
|
||||
+ ASN1module_t module = NULL;
|
||||
+
|
||||
+ TRACE("%u, %u, %x, %u, %p, %p, %p, %p, %u\n", version, rule, flags, pdu, encoder, decoder, freememory, size, modulename);
|
||||
+
|
||||
+ if (!((encoder) && (decoder) && (freememory) && (size)))
|
||||
+ return NULL;
|
||||
+
|
||||
+ module = (ASN1module_t) malloc(sizeof(struct tagASN1module_t));
|
||||
+ ZeroMemory(module, sizeof(struct tagASN1module_t));
|
||||
+
|
||||
+ if (module)
|
||||
+ {
|
||||
+ module->nModuleName = modulename;
|
||||
+ module->dwFlags = flags;
|
||||
+ module->eRule = rule;
|
||||
+ module->cPDUs = pdu;
|
||||
+ module->apfnFreeMemory = freememory;
|
||||
+ module->acbStructSize = size;
|
||||
+
|
||||
+ if (rule & ASN1_BER_RULE)
|
||||
+ {
|
||||
+ module->BER.apfnEncoder = (const ASN1BerEncFun_t*) encoder;
|
||||
+ module->BER.apfnDecoder = (const ASN1BerDecFun_t*) decoder;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return module;
|
||||
+}
|
||||
diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec
|
||||
index 1658399..ca6a461 100644
|
||||
--- a/dlls/msasn1/msasn1.spec
|
||||
+++ b/dlls/msasn1/msasn1.spec
|
||||
@@ -223,7 +223,7 @@
|
||||
@ stub ASN1_CreateDecoder
|
||||
@ stub ASN1_CreateDecoderEx
|
||||
@ stub ASN1_CreateEncoder
|
||||
-@ stub ASN1_CreateModule
|
||||
+@ stdcall ASN1_CreateModule(long long long long ptr ptr ptr ptr long)
|
||||
@ stub ASN1_Decode
|
||||
@ stub ASN1_Encode
|
||||
@ stub ASN1_FreeDecoded
|
||||
--
|
||||
1.9.1
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: [38020] msasn1: implement ASN1_CreateModule
|
@ -181,7 +181,6 @@ patch_enable_all ()
|
||||
enable_mciavi32_fullscreen_support="$1"
|
||||
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
|
||||
enable_mountmgr_DosDevices="$1"
|
||||
enable_msasn1_ASN1_CreateModule="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
enable_mshtml_HTMLLocation_put_hash="$1"
|
||||
enable_msi_MsiGetDatabaseState="$1"
|
||||
@ -696,9 +695,6 @@ patch_enable ()
|
||||
mountmgr-DosDevices)
|
||||
enable_mountmgr_DosDevices="$2"
|
||||
;;
|
||||
msasn1-ASN1_CreateModule)
|
||||
enable_msasn1_ASN1_CreateModule="$2"
|
||||
;;
|
||||
mscoree-CorValidateImage)
|
||||
enable_mscoree_CorValidateImage="$2"
|
||||
;;
|
||||
@ -4132,21 +4128,6 @@ if test "$enable_mountmgr_DosDevices" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msasn1-ASN1_CreateModule
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38020] msasn1: implement ASN1_CreateModule
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/msasn1/main.c, dlls/msasn1/msasn1.spec
|
||||
# |
|
||||
if test "$enable_msasn1_ASN1_CreateModule" -eq 1; then
|
||||
patch_apply msasn1-ASN1_CreateModule/0001-msasn1-implement-ASN1_CreateModule.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Austin English", "msasn1: Implement ASN1_CreateModule.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mscoree-CorValidateImage
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
x
Reference in New Issue
Block a user