November 2020 - Wine-commits

Vijay Kiran Kamuju : ole2.dll16: Add stub OleIsCurrentClipboard function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 1c66b0065107fc97c938e986dce3957315ebb33a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c66b0065107fc97c938e986… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Jun 2 18:02:50 2020 +0200 ole2.dll16: Add stub OleIsCurrentClipboard function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7102 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9c95434095630aa1ed4f1ae3763424f09f423575) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 5e6142fc96a..04b40b08635 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -272,6 +272,15 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +/*********************************************************************** + * OleIsCurrentClipboard [OLE2.77] + */ +HRESULT WINAPI OleIsCurrentClipboard16(IDataObject* pDataObj) +{ + FIXME("(%p): stub\n", pDataObj); + return S_OK; +} + #define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 108c3ee8f31..7aac6864e56 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -72,7 +72,7 @@ 74 stub READFMTUSERTYPESTG 75 stub WRITEFMTUSERTYPESTG 76 pascal -ret16 OleFlushClipboard() OleFlushClipboard16 -77 stub OLEISCURRENTCLIPBOARD +77 pascal OleIsCurrentClipboard(ptr) OleIsCurrentClipboard16 78 stub OLETRANSLATEACCELERATOR 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16 80 stub OLEGETAUTOCONVERT

1 0

Vijay Kiran Kamuju : winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 3320ae7eff0125c509215a8cf6f72bf48a3f642d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3320ae7eff0125c509215a8c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 3 09:42:49 2020 +0100 winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 992a0ae7b90d92bcda52d82672ece1d3c7d4b0ea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0065801d904..0cea2ea39ae 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5404,9 +5404,25 @@ BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo) BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, LPSTR pPrintProcessorName) { - FIXME("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), + UNICODE_STRING NameW, EnvW, PathW, ProcessorW; + BOOL ret; + + TRACE("(%s,%s,%s,%s)\n", debugstr_a(pName), debugstr_a(pEnvironment), debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); - return FALSE; + + asciitounicode(&NameW, pName); + asciitounicode(&EnvW, pEnvironment); + asciitounicode(&PathW, pPathName); + asciitounicode(&ProcessorW, pPrintProcessorName); + + ret = AddPrintProcessorW(NameW.Buffer, EnvW.Buffer, PathW.Buffer, ProcessorW.Buffer); + + RtlFreeUnicodeString(&ProcessorW); + RtlFreeUnicodeString(&PathW); + RtlFreeUnicodeString(&EnvW); + RtlFreeUnicodeString(&NameW); + + return ret; } /*****************************************************************************

1 0

Vijay Kiran Kamuju : include: Add related ASN1encoding_s and ASN1decoding_s structs.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 4ff95ee8825e9922fbfa010decad56be2b1c6e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff95ee8825e9922fbfa010d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:38:33 2020 +0200 include: Add related ASN1encoding_s and ASN1decoding_s structs. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7e9bee3a8dc145426d97271e99e689af81fb30a6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msasn1.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/include/msasn1.h b/include/msasn1.h index 89a6255a5fe..dd0bcb5b3df 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -43,6 +43,11 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +#define ASN1_MAKE_VERSION(major,minor) (((major) << 16) | (minor)) +#define ASN1_THIS_VERSION ASN1_MAKE_VERSION(1,0) + +#define ASN1DECFREE_NON_PDU_ID ((ASN1uint32_t)-1) + typedef void (WINAPI *ASN1FreeFun_t)(void *data); typedef void (WINAPI *ASN1GenericFun_t)(void); @@ -64,6 +69,30 @@ typedef struct tagASN1BerFunArr_t { const ASN1BerDecFun_t *apfnDecoder; } ASN1BerFunArr_t; +enum +{ + ASN1FLAGS_NONE = 0x00000000, + ASN1FLAGS_NOASSERT = 0x00001000 +}; + +enum +{ + ASN1ENCODE_APPEND = 0x00000001, + ASN1ENCODE_REUSEBUFFER = 0x00000004, + ASN1ENCODE_SETBUFFER = 0x00000008, + ASN1ENCODE_ALLOCATEBUFFER = 0x00000010, + ASN1ENCODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + +enum +{ + ASN1DECODE_APPENDED = 0x00000001, + ASN1DECODE_REWINDBUFFER = 0x00000004, + ASN1DECODE_SETBUFFER = 0x00000008, + ASN1DECODE_AUTOFREEBUFFER = 0x00000010, + ASN1DECODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + typedef struct tagASN1bitstring_t { ASN1uint32_t length; @@ -128,6 +157,9 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +#define ASN1_SUCCEEDED(ret) (((int)(ret)) >= 0) +#define ASN1_FAILED(ret) (((int)(ret)) < 0) + typedef struct tagASN1generalizedtime_t { ASN1uint16_t year; @@ -147,19 +179,52 @@ typedef struct tagASN1intx_t ASN1octet_t *value; } ASN1intx_t; -typedef struct tagASN1module_t { +typedef struct tagASN1module_t +{ ASN1magic_t nModuleName; ASN1encodingrule_e eRule; ASN1uint32_t dwFlags; ASN1uint32_t cPDUs; const ASN1FreeFun_t *apfnFreeMemory; const ASN1uint32_t *acbStructSize; - union { - ASN1PerFunArr_t PER; - ASN1BerFunArr_t BER; + union + { + ASN1PerFunArr_t PER; + ASN1BerFunArr_t BER; }; } *ASN1module_t; +struct ASN1encoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1uint32_t cbExtraHeader; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + +struct ASN1decoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + typedef struct ASN1objectidentifier_s { struct ASN1objectidentifier_s *next;

1 0

Vijay Kiran Kamuju : msasn1: Add ASN1_CreateModule stub implementation.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: f94584389c19c0898cf8544c5bc732b95d0f5540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94584389c19c0898cf8544c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:43:06 2020 +0200 msasn1: Add ASN1_CreateModule stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 48aefd2a0409d8c2a8474eb110992ac2532b6a78) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 19 +++++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 7ca0eac63e9..90c4a8a9c9d 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -23,6 +23,10 @@ #include "winbase.h" #include "msasn1.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msasn1); + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -37,3 +41,18 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, ASN1uint32_t flags, + ASN1uint32_t pdu, const ASN1GenericFun_t encoder[], + const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freemem[], + const ASN1uint32_t size[], ASN1magic_t magic) +{ + ASN1module_t module = NULL; + + FIXME("(%08x %08x %08x %u %p %p %p %p %u): Stub!\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + + if (!encoder || !decoder || !freemem || !size) + return module; + + return module; +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index 165839964d3..ca6a461c650 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 0

Vijay Kiran Kamuju : msasn1/tests: Add initial tests.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 14349f4f78336ea85d3933ed9ee572ab2b790f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14349f4f78336ea85d3933ed… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:45:01 2020 +0200 msasn1/tests: Add initial tests. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4e2ad334b5881af7661be4d6df3c51aae92ca4a2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msasn1/tests/Makefile.in | 5 ++++ dlls/msasn1/tests/asn1.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/configure b/configure index b3a56d1a35f..05194a51d2f 100755 --- a/configure +++ b/configure @@ -20611,6 +20611,7 @@ wine_fn_config_makefile dlls/msado15 enable_msado15 wine_fn_config_makefile dlls/msado15/tests enable_tests wine_fn_config_makefile dlls/msadp32.acm enable_msadp32_acm wine_fn_config_makefile dlls/msasn1 enable_msasn1 +wine_fn_config_makefile dlls/msasn1/tests enable_tests wine_fn_config_makefile dlls/mscat32 enable_mscat32 wine_fn_config_makefile dlls/mscms enable_mscms wine_fn_config_makefile dlls/mscms/tests enable_tests diff --git a/configure.ac b/configure.ac index 5e363315967..95730668e92 100644 --- a/configure.ac +++ b/configure.ac @@ -3422,6 +3422,7 @@ WINE_CONFIG_MAKEFILE(dlls/msado15) WINE_CONFIG_MAKEFILE(dlls/msado15/tests) WINE_CONFIG_MAKEFILE(dlls/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) +WINE_CONFIG_MAKEFILE(dlls/msasn1/tests) WINE_CONFIG_MAKEFILE(dlls/mscat32) WINE_CONFIG_MAKEFILE(dlls/mscms) WINE_CONFIG_MAKEFILE(dlls/mscms/tests) diff --git a/dlls/msasn1/tests/Makefile.in b/dlls/msasn1/tests/Makefile.in new file mode 100644 index 00000000000..395ef933c0d --- /dev/null +++ b/dlls/msasn1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msasn1.dll +IMPORTS = msasn1 + +C_SRCS = \ + asn1.c diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c new file mode 100644 index 00000000000..19019fc72b0 --- /dev/null +++ b/dlls/msasn1/tests/asn1.c @@ -0,0 +1,58 @@ +/* + * Copyright 2020 Vijay Kiran Kamuju + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "msasn1.h" +#include "wine/test.h" + +static void test_CreateModule(void) +{ + const ASN1GenericFun_t encfn[] = { NULL }; + const ASN1GenericFun_t decfn[] = { NULL }; + const ASN1FreeFun_t freefn[] = { NULL }; + const ASN1uint32_t size[] = { 0 }; + ASN1magic_t name = 0x61736e31; + ASN1module_t mod; + + mod = ASN1_CreateModule(0, 0, 0, 0, NULL, NULL, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, NULL, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); + todo_wine ok(!!mod, "Failed to create module.\n"); + + mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); + todo_wine ok(!!mod, "Failed to create module.\n"); +} + +START_TEST(asn1) +{ + test_CreateModule(); +}

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CreateModule function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 4ab01c4eeae626d3d38542cac0c07a65c788dbf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ab01c4eeae626d3d38542ca… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 13:51:36 2020 +0200 msasn1: Implement ASN1_CreateModule function. Based on patch from Austin English. Wine-Bug: https:/bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84096382fc4ca80f5fc59908bf287e28a291bae8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 30 +++++++++++++++++++++++++++++- dlls/msasn1/tests/asn1.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 90c4a8a9c9d..6882fbf6c9b 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "msasn1.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msasn1); @@ -49,10 +50,37 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, { ASN1module_t module = NULL; - FIXME("(%08x %08x %08x %u %p %p %p %p %u): Stub!\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + TRACE("(%08x %08x %08x %u %p %p %p %p %u)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); if (!encoder || !decoder || !freemem || !size) return module; + module = heap_alloc(sizeof(module)); + if (module) + { + module->nModuleName = magic; + module->eRule = rule; + module->dwFlags = flags; + module->cPDUs = pdu; + module->apfnFreeMemory = freemem; + module->acbStructSize = size; + + if (rule & ASN1_PER_RULE) + { + module->PER.apfnEncoder = (ASN1PerEncFun_t *)encoder; + module->PER.apfnDecoder = (ASN1PerDecFun_t *)decoder; + } + else if (rule & ASN1_BER_RULE) + { + module->BER.apfnEncoder = (ASN1BerEncFun_t *)encoder; + module->BER.apfnDecoder = (ASN1BerDecFun_t *)decoder; + } + else + { + module->PER.apfnEncoder = NULL; + module->PER.apfnDecoder = NULL; + } + } + return module; } diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 19019fc72b0..adbf547efaf 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -46,10 +46,39 @@ static void test_CreateModule(void) ok(!mod, "Expected Failure.\n"); mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==0, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==0, "Got eRule = %08x\n.",mod->eRule); + ok(mod->dwFlags==0, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->cPDUs==0, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); + ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_BER_RULE_DER, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); + ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + + mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_PER_RULE_ALIGNED, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->PER.apfnEncoder==(ASN1PerEncFun_t *)encfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); + ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); } START_TEST(asn1)

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CloseModule function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: be2bece3abfcb9db3c8a8f0adb739f713db281cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=be2bece3abfcb9db3c8a8f0a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 14:21:43 2020 +0200 msasn1: Implement ASN1_CloseModule function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d2f30370067e194dfdcc72b3e675aaedcc2061b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 7 +++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 6882fbf6c9b..b30725aa63d 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -84,3 +84,10 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, return module; } + +void WINAPI ASN1_CloseModule(ASN1module_t module) +{ + TRACE("(%p)\n", module); + + heap_free(module); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index ca6a461c650..09935f51492 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -219,7 +219,7 @@ @ stub ASN1_CloseDecoder @ stub ASN1_CloseEncoder2 @ stub ASN1_CloseEncoder -@ stub ASN1_CloseModule +@ stdcall ASN1_CloseModule(ptr) @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx @ stub ASN1_CreateEncoder diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index adbf547efaf..80f4dd59901 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -55,6 +55,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -66,6 +67,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -79,6 +81,7 @@ static void test_CreateModule(void) broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); + ASN1_CloseModule(mod); } START_TEST(asn1)

1 0

Vijay Kiran Kamuju : msasn1: Add partial implementation of ASN1_CreateEncoder.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 645e2b653c09f87dfc25f3879a57152e69e885c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=645e2b653c09f87dfc25f387… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu May 7 15:59:30 2020 +0200 msasn1: Add partial implementation of ASN1_CreateEncoder. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b0e26779558ee36ae0cfc1071c113995cf0a79d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 46 ++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 161 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 195 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=645e2b653c09f87dfc25…

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_CloseEncoder function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 90646a03a2a1aa40f3a9dd4563666645a92f3b8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=90646a03a2a1aa40f3a9dd45… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:36:44 2020 +0200 msasn1: Add stub for ASN1_CloseEncoder function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85dbf7b0144e29ab33274b252f59a278608c278e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 5 +++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 5c9c6a5c863..f6ad865282a 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -137,3 +137,8 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod return ASN1_SUCCESS; } + +void WINAPI ASN1_CloseEncoder(ASN1encoding_t encoder) +{ + FIXME("(%p): Stub!\n", encoder); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index d79128344fa..4ebc8f32ef9 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -218,7 +218,7 @@ @ stub ASN1PERFreeSeqOf @ stub ASN1_CloseDecoder @ stub ASN1_CloseEncoder2 -@ stub ASN1_CloseEncoder +@ stdcall ASN1_CloseEncoder(ptr) @ stdcall ASN1_CloseModule(ptr) @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index e0ffbcd623c..9d2c4231f7b 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -118,6 +118,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -134,6 +135,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -150,6 +152,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -166,14 +169,17 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); @@ -192,6 +198,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(!!encoder,"Encoder creation failed.\n"); @@ -207,14 +214,17 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); }

1 0

Vijay Kiran Kamuju : msasn1: Add partial implementation of ASN1_CreateDecoder.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 0950129058201c3bc8317844ff261a8e7c3e2689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0950129058201c3bc8317844… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:39:46 2020 +0200 msasn1: Add partial implementation of ASN1_CreateDecoder. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fc2c1b5d6079960eb53009f57cffb9b6bbbcda80) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 43 ++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0950129058201c3bc831…

1 0