wine-devel January 2021

wine-devel@winehq.org

74 participants
438 discussions

[PATCH 1/3] ntdll: Introduce new HEAP_DeleteFreeBlock helper.
by Rémi Bernon 15 Jan '21

15 Jan '21

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is a patch series that has been in Wine Staging for ages, and that I've cleaned up a bit. The staging patch series actually does more than this, as it also increase the number of free lists by a lot and does some state caching and other small optimisations, but this rbtree optimization is the main source of performance improvement. [1] Although the series increases performance noticeably on synthethic benchmarks, as I measured in the past [2], it still isn't great in multi-threaded allocations scenarios, as it still uses a global lock. The patch series is in Wine Staging and in Proton though, so I thought it was still worth cleaning it up and sending it upstream, unless it is then considered not interesting enough. [1] I've split and analyzed each part of the patch separately in: https://bugs.winehq.org/show_bug.cgi?id=49113#c9 [2] https://www.winehq.org/pipermail/wine-devel/2020-May/165892.html dlls/ntdll/heap.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 88db935746a..31a7ba18d61 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -3,6 +3,7 @@ * * Copyright 1996 Alexandre Julliard * Copyright 1998 Ulrich Weigand + * Copyright 2017 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -494,6 +495,17 @@ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL la } +/*********************************************************************** + * HEAP_DeleteFreeBlock + * + * Delete a free block from the free list. + */ +static inline void HEAP_DeleteFreeBlock( HEAP *heap, ARENA_FREE *pArena ) +{ + list_remove( &pArena->entry ); +} + + /*********************************************************************** * HEAP_FindSubHeap * Find the sub-heap containing a given address. @@ -602,7 +614,7 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) { /* Remove the next arena from the free list */ ARENA_FREE *pNext = (ARENA_FREE *)((char *)ptr + size); - list_remove( &pNext->entry ); + HEAP_DeleteFreeBlock( subheap->heap, pNext ); size += (pNext->size & ARENA_SIZE_MASK) + sizeof(*pNext); mark_block_free( pNext, sizeof(ARENA_FREE), flags ); } @@ -657,7 +669,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) pFree = *((ARENA_FREE **)pArena - 1); size += (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); /* Remove it from the free list */ - list_remove( &pFree->entry ); + HEAP_DeleteFreeBlock( heap, pFree ); } else pFree = (ARENA_FREE *)pArena; @@ -677,7 +689,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) size = 0; /* Remove the free block from the list */ - list_remove( &pFree->entry ); + HEAP_DeleteFreeBlock( heap, pFree ); /* Remove the subheap from the list */ list_remove( &subheap->entry ); /* Free the memory */ @@ -1694,7 +1706,7 @@ void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_ /* Remove the arena from the free list */ - list_remove( &pArena->entry ); + HEAP_DeleteFreeBlock( heapPtr, pArena ); /* Build the in-use arena */ @@ -1851,7 +1863,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size { /* The next block is free and large enough */ ARENA_FREE *pFree = (ARENA_FREE *)pNext; - list_remove( &pFree->entry ); + HEAP_DeleteFreeBlock( heapPtr, pFree ); pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree); if (!HEAP_Commit( subheap, pArena, rounded_size )) goto oom; notify_realloc( pArena + 1, oldActualSize, size ); @@ -1869,7 +1881,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size /* Build the in-use arena */ - list_remove( &pNew->entry ); + HEAP_DeleteFreeBlock( heapPtr, pNew ); pInUse = (ARENA_INUSE *)pNew; pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); -- 2.30.0

2 4

[tools] testbot/build: ARCH_STRING has been renamed to GECKO_ARCH.
by Francois Gouget 15 Jan '21

15 Jan '21

This matches the MONO_ARCH property. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index aa786183b5..a56a4f2a49 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -490,11 +490,7 @@ sub UpdateAddOns() my $Arch = ""; while (my $Line= <$fh>) { - if ($Line =~ /^\s*#\s*define\s+ARCH_STRING\s+"([^"]+)"/) - { - $Arch = $1; - } - elsif ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/) + if ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/) { $Arch = $1; } -- 2.20.1

1 0

[PATCH resend] iphlpapi: Reimplement toIPAddressString on top of RtlIpv4AddressToStringA
by Alex Henrie 15 Jan '21

15 Jan '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- There's no need to reinvent the wheel here; RtlIpv4AddressToStringA avoids the need for strcpy and is guaranteed to do nothing if the pointer to the output string is null. --- dlls/iphlpapi/ifenum.c | 20 -------------------- dlls/iphlpapi/ifenum.h | 9 ++++++--- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index c3abdf0e536..288e04db7b8 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -35,14 +35,6 @@ #include <sys/socket.h> #endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif - #ifdef HAVE_NET_IF_H #include <net/if.h> #endif @@ -1106,15 +1098,3 @@ ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_ad } #endif - -char *toIPAddressString(unsigned int addr, char string[16]) -{ - if (string) { - struct in_addr iAddr; - - iAddr.s_addr = addr; - /* extra-anal, just to make auditors happy */ - lstrcpynA(string, inet_ntoa(iAddr), 16); - } - return string; -} diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index c6bf9575759..d75d4c0796f 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -40,6 +40,7 @@ #define USE_WS_PREFIX #include "iprtrmib.h" #include "winsock2.h" +#include "ip2string.h" #define MAX_INTERFACE_PHYSADDR 8 #define MAX_INTERFACE_DESCRIPTION 256 @@ -109,10 +110,12 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, SOCKET_ADDRESS **masks) DECLSPEC_HIDDEN; -/* Converts the network-order bytes in addr to a printable string. Returns - * string. +/* Converts the network-order bytes in addr to a printable string. */ -char *toIPAddressString(unsigned int addr, char string[16]) DECLSPEC_HIDDEN; +static inline void toIPAddressString(ULONG addr, char string[16]) +{ + RtlIpv4AddressToStringA((IN_ADDR *)&addr, string); +} DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) DECLSPEC_HIDDEN; DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) DECLSPEC_HIDDEN; -- 2.30.0

2 2

[tools] testbot: Take into account configure for the build timeout.
by Francois Gouget 15 Jan '21

15 Jan '21

It is likely that configure will need to be rerun after a make_makefiles, even outside of full rebuilds. In particular this is the case when adding a new dll, program or test directory. So take the configure time out of the full-rebuild timeouts and into its own $ReconfigBuildTimeout setting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids getting a build timeout when adding a new test directory, such as happened to the chcp.com test: https://testbot.winehq.org/JobDetails.pl?Key=83895 (On my box the build clocked in at 26s but on the TestBot configure alone takes from 40 to 58s.) testbot/lib/WineTestBot/Config.pm | 11 +++++++---- testbot/lib/WineTestBot/PatchUtils.pm | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 68709e526e..2f01e951bd 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList $LDAPServer @@ -48,7 +48,7 @@ require Exporter; $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList @@ -109,15 +109,18 @@ $MaxVMErrors = 3; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; +# Build configure timeout (in seconds) +$ReconfigBuildTimeout = 60; + # Exe build timeouts (in seconds) # - For a full build -$ExeBuildTimeout = 7 * 60; +$ExeBuildTimeout = 6 * 60; # - For a single module $ExeModuleTimeout = 30; # Wine build timeouts (in seconds) # - For a full build -$WineBuildTimeout = 25 * 60; +$WineBuildTimeout = 24 * 60; # - For a single module $WineModuleTimeout = 60; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 26c16c4127..974ff8eb6b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -521,19 +521,22 @@ sub GetBuildTimeout($$) # Set $ModuleCount to 0 if a full rebuild is needed my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); + my $Reconfig = (!$Impacts or $Impacts->{Autoconf} or $Impacts->{MakeMakefiles}); my ($ExeTimeout, $WineTimeout) = (0, 0); if ($ExeCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : $ExeBuildTimeout; - $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild); + $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild) + + ($Reconfig ? $ExeCount * $ReconfigBuildTimeout : 0); } if ($WineCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $WineModuleTimeout : $WineBuildTimeout; - $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild); + $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild) + + ($Reconfig ? $WineCount * $ReconfigBuildTimeout : 0); } return $ExeTimeout + $WineTimeout; -- 2.20.1

1 0

[PATCH] dwrite: Compatible with windows 6.1 and windows 8.1 words 5 wrapping.
by Haoyang Chen 15 Jan '21

15 Jan '21

2 1

[PATCH 3/3] msado15: Implement ADOConnectionConstruction15 get_Session
by Alistair Leslie-Hughes 15 Jan '21

15 Jan '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index c6a52e262c2..63014d7e37e 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -753,8 +753,12 @@ static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, I static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session) { struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); - FIXME("%p, %p\n", connection, session); - return E_NOTIMPL; + TRACE("%p, %p\n", connection, session); + + *session = connection->session; + if (*session) + IUnknown_AddRef(*session); + return S_OK; } static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso, -- 2.29.2

2 1

[PATCH 2/3] msado15: Support ADOConnectionConstruction15 on _Connection interface
by Alistair Leslie-Hughes 15 Jan '21

15 Jan '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 61 ++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 2 +- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index fd15d5a443f..c6a52e262c2 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -50,6 +50,7 @@ struct connection _Connection Connection_iface; ISupportErrorInfo ISupportErrorInfo_iface; IConnectionPointContainer IConnectionPointContainer_iface; + ADOConnectionConstruction15 ADOConnectionConstruction15_iface; LONG refs; ObjectStateEnum state; LONG timeout; @@ -76,6 +77,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection *impl_from_ADOConnectionConstruction15( ADOConnectionConstruction15 *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, ADOConnectionConstruction15_iface ); +} + static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) { return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); @@ -129,6 +135,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_ADOConnectionConstruction15 )) + { + *obj = &connection->ADOConnectionConstruction15_iface; + } else if (IsEqualGUID( riid, &IID_IRunnableObject )) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -715,6 +725,56 @@ static const IConnectionPointVtbl connpoint_vtbl = connpoint_EnumConnections }; +static HRESULT WINAPI adoconstruct_QueryInterface(ADOConnectionConstruction15 *iface, REFIID riid, void **obj) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI adoconstruct_AddRef(ADOConnectionConstruction15 *iface) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI adoconstruct_Release(ADOConnectionConstruction15 *iface) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, IUnknown **dso) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p\n", connection, dso); + return E_NOTIMPL; +} + +static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p\n", connection, session); + return E_NOTIMPL; +} + +static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso, + IUnknown *session) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p, %p\n", connection, dso, session); + return E_NOTIMPL; +} + +struct ADOConnectionConstruction15Vtbl ado_construct_vtbl = +{ + adoconstruct_QueryInterface, + adoconstruct_AddRef, + adoconstruct_Release, + adoconstruct_get_DSO, + adoconstruct_get_Session, + adoconstruct_WrapDSOandSession +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -723,6 +783,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl; + connection->ADOConnectionConstruction15_iface.lpVtbl = &ado_construct_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8b08e8af193..50418690613 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1046,7 +1046,7 @@ static void test_Connection(void) IConnectionPointContainer_Release(pointcontainer); hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct); - todo_wine ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); + ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); if (hr == S_OK) ADOConnectionConstruction15_Release(construct); -- 2.29.2

2 1

[PATCH 1/3] msado15: Only support put CursorLocation on Closed Recordset
by Alistair Leslie-Hughes 15 Jan '21

15 Jan '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e915922fdc4..e830f66e1ba 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1279,6 +1279,8 @@ static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLoc TRACE( "%p, %u\n", iface, cursor_loc ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->cursor_location = cursor_loc; return S_OK; -- 2.29.2

2 1

[PATCH 1/2] dbghelp: Fix unwind opcodes on x64.
by Paul Gofman 15 Jan '21

15 Jan '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/dbghelp/cpu_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c2789d0d71b..c04d8db61cf 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -41,7 +41,8 @@ typedef enum _UNWIND_OP_CODES UWOP_SET_FPREG, UWOP_SAVE_NONVOL, UWOP_SAVE_NONVOL_FAR, - UWOP_SAVE_XMM128, + UWOP_EPILOG, + UWOP_SAVE_XMM128 = 8, UWOP_SAVE_XMM128_FAR, UWOP_PUSH_MACHFRAME } UNWIND_CODE_OPS; -- 2.29.2

1 1

[PATCH 1/7] bcrypt: Introduce export_gnutls_datum() helper and use it in export_gnutls_pubkey_rsa().
by Paul Gofman 15 Jan '21

15 Jan '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Gnutls datum size might appear shorter than expected due to higher bits being zero in the random numbers. Gnutls export functions don't usually pad the data when exporting keys. bcrypt does not expect that currently. This is reproducible as random failures in some of the existing tests. Here is the testing patch which reliably reproduces this issue: https://gist.github.com/gofman/b15f91e2fb5246d13edcaf30eb6196f1. dlls/bcrypt/gnutls.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c065ac31fba..9e6dd4cc9a6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -28,6 +28,7 @@ #ifdef HAVE_GNUTLS_CIPHER_INIT #include <stdarg.h> +#include <assert.h> #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #include <gnutls/abstract.h> @@ -665,11 +666,27 @@ static void CDECL key_symmetric_destroy( struct key *key ) if (key_data(key)->cipher) pgnutls_cipher_deinit( key_data(key)->cipher ); } +static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, ULONG *actual_length ) +{ + ULONG size = d->size; + UCHAR *src = d->data; + + assert( size <= length + 1 ); + if (size == length + 1) + { + assert(!src[0]); + ++src; + --size; + } + *actual_length = size; + memcpy( buffer, src, size ); +} + static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, UCHAR **pubkey, ULONG *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob; gnutls_datum_t m, e; - UCHAR *dst, *src; + UCHAR *dst; int ret; if ((ret = pgnutls_privkey_export_rsa_raw( gnutls_key, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) @@ -686,32 +703,18 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit } dst = (UCHAR *)(rsa_blob + 1); - if (e.size == bitlen / 8 + 1 && !e.data[0]) - { - src = e.data + 1; - e.size--; - } - else src = e.data; - memcpy( dst, src, e.size ); + export_gnutls_datum( dst, bitlen / 8, &e, &rsa_blob->cbPublicExp ); - dst += e.size; - if (m.size == bitlen / 8 + 1 && !m.data[0]) - { - src = m.data + 1; - m.size--; - } - else src = m.data; - memcpy( dst, src, m.size ); + dst += rsa_blob->cbPublicExp; + export_gnutls_datum( dst, bitlen / 8, &m, &rsa_blob->cbModulus ); rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; rsa_blob->BitLength = bitlen; - rsa_blob->cbPublicExp = e.size; - rsa_blob->cbModulus = m.size; rsa_blob->cbPrime1 = 0; rsa_blob->cbPrime2 = 0; *pubkey = (UCHAR *)rsa_blob; - *pubkey_len = sizeof(*rsa_blob) + e.size + m.size; + *pubkey_len = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; free( e.data ); free( m.data ); return STATUS_SUCCESS; -- 2.29.2

1 6

← Newer
1
...
31
32
33
34
35
36
37
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel January 2021