December 2022 - Wine-Commits

Alex Henrie : setupapi: Use _S_I(READ|WRITE) from sys/stat.h instead of redefining them.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: a1ae33a3efb7231adf683484e9de66f84abb04d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1ae33a3efb7231adf683484e9de66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 23:40:20 2022 -0700 setupapi: Use _S_I(READ|WRITE) from sys/stat.h instead of redefining them. --- dlls/setupapi/setupapi_private.h | 4 ---- dlls/setupapi/setupcab.c | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 7681348a11c..888b959c2e4 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -104,10 +104,6 @@ struct callback_WtoA_context UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, UINT_PTR ) DECLSPEC_HIDDEN; -/* from msvcrt/sys/stat.h */ -#define _S_IWRITE 0x0080 -#define _S_IREAD 0x0100 - extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN; extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN; diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 59f5f06635e..d6b5f40cfba 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <fcntl.h> #include <share.h> +#include <sys/stat.h> #include "windef.h" #include "winbase.h"

1 0

Alex Henrie : kernel32/tests: Use the strcasecmp function instead of reimplementing it.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 85bf40401801981b4794859de13108f151b0e487 URL: https://gitlab.winehq.org/wine/wine/-/commit/85bf40401801981b4794859de13108… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 21:17:19 2022 -0700 kernel32/tests: Use the strcasecmp function instead of reimplementing it. --- dlls/kernel32/tests/process.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0d877f715aa..a15f8dd1fa8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -547,31 +547,12 @@ static WCHAR* getChildStringW(const char* sect, const char* key) return ret; } -/* FIXME: this may be moved to the wtmain.c file, because it may be needed by - * others... (windows uses stricmp while Un*x uses strcasecmp...) - */ -static int wtstrcasecmp(const char* p1, const char* p2) -{ - char c1, c2; - - c1 = c2 = '@'; - while (c1 == c2 && c1) - { - c1 = *p1++; c2 = *p2++; - if (c1 != c2) - { - c1 = toupper(c1); c2 = toupper(c2); - } - } - return c1 - c2; -} - static int strCmp(const char* s1, const char* s2, BOOL sensitive) { if (!s1 && !s2) return 0; if (!s2) return -1; if (!s1) return 1; - return (sensitive) ? strcmp(s1, s2) : wtstrcasecmp(s1, s2); + return (sensitive) ? strcmp(s1, s2) : strcasecmp(s1, s2); } static void ok_child_string( int line, const char *sect, const char *key,

1 0

Alex Henrie : msi: Use _O_* constants from fcntl.h instead of redefining them.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: b07c95e79cdf6ae26c5170daa481ad160e0ce76a URL: https://gitlab.winehq.org/wine/wine/-/commit/b07c95e79cdf6ae26c5170daa481ad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 23:51:37 2022 -0700 msi: Use _O_* constants from fcntl.h instead of redefining them. --- dlls/msi/media.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index fb96014317b..bc17e5fcb62 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <fcntl.h> #include <stdarg.h> #define COBJMACROS @@ -35,23 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -/* from msvcrt/fcntl.h */ -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) -#define _O_APPEND 0x0008 -#define _O_RANDOM 0x0010 -#define _O_SEQUENTIAL 0x0020 -#define _O_TEMPORARY 0x0040 -#define _O_NOINHERIT 0x0080 -#define _O_CREAT 0x0100 -#define _O_TRUNC 0x0200 -#define _O_EXCL 0x0400 -#define _O_SHORT_LIVED 0x1000 -#define _O_TEXT 0x4000 -#define _O_BINARY 0x8000 - static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) { WCHAR volume_name[MAX_PATH + 1], root[MAX_PATH + 1];

1 0

Hans Leidekker : wpcap: Build pcap_address structure from IP_ADAPTER_UNICAST_ADDRESS.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 382dbe77f63e70bac65a4e182aae1bdf4e297e25 URL: https://gitlab.winehq.org/wine/wine/-/commit/382dbe77f63e70bac65a4e182aae1b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:23:46 2022 +0200 wpcap: Build pcap_address structure from IP_ADAPTER_UNICAST_ADDRESS. --- dlls/wpcap/unixlib.h | 14 ++---- dlls/wpcap/wpcap.c | 129 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 94 insertions(+), 49 deletions(-) diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 8cd64ef0210..18854e0b86b 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -17,18 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -struct sockaddr_hdr -{ - unsigned short sa_family; -}; - struct pcap_address { struct pcap_address *next; - struct sockaddr_hdr *addr; - struct sockaddr_hdr *netmask; - struct sockaddr_hdr *broadaddr; - struct sockaddr_hdr *dstaddr; + struct sockaddr *addr; + struct sockaddr *netmask; + struct sockaddr *broadaddr; + struct sockaddr *dstaddr; }; struct pcap_interface @@ -57,7 +52,6 @@ struct pcap struct pcap_pkthdr_win32 hdr; }; - struct compile_params { struct pcap *pcap; diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index bc4cb63c623..4d8a115b0ea 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -26,6 +26,7 @@ #include "winsock2.h" #include "ws2ipdef.h" #include "iphlpapi.h" +#include "netioapi.h" #include "wine/unixlib.h" #include "wine/debug.h" @@ -236,59 +237,109 @@ static char *build_win32_description( const struct pcap_interface *unix_dev ) return ret; } -static struct sockaddr_hdr *dup_sockaddr( const struct sockaddr_hdr *addr ) +static struct sockaddr *get_address( const IP_ADAPTER_UNICAST_ADDRESS *addr ) { - struct sockaddr_hdr *ret; + struct sockaddr *ret; + if (!(ret = malloc( addr->Address.iSockaddrLength ))) return NULL; + memcpy( ret, addr->Address.lpSockaddr, addr->Address.iSockaddrLength ); + return ret; +} + +static void convert_length_to_ipv6_mask( ULONG length, IN6_ADDR *mask ) +{ + unsigned int i; + for (i = 0; i < length / 8; i++) mask->u.Byte[i] = 0xff; + mask->u.Byte[i] = 0xff << (8 - length % 8); +} + +static struct sockaddr *get_netmask( const IP_ADAPTER_UNICAST_ADDRESS *addr ) +{ + struct sockaddr *ret; - switch (addr->sa_family) + switch (addr->Address.lpSockaddr->sa_family) { case AF_INET: { - struct sockaddr_in *dst, *src = (struct sockaddr_in *)addr; - if (!(dst = calloc( 1, sizeof(*dst) ))) return NULL; - dst->sin_family = src->sin_family; - dst->sin_port = src->sin_port; - dst->sin_addr = src->sin_addr; - ret = (struct sockaddr_hdr *)dst; + struct sockaddr_in *netmask_addr_in; + + if (!(netmask_addr_in = calloc( 1, sizeof(*netmask_addr_in) ))) return NULL; + netmask_addr_in->sin_family = AF_INET; + ConvertLengthToIpv4Mask( addr->OnLinkPrefixLength, &netmask_addr_in->sin_addr.S_un.S_addr ); + ret = (struct sockaddr *)netmask_addr_in; break; } case AF_INET6: { - struct sockaddr_in6 *dst, *src = (struct sockaddr_in6 *)addr; - if (!(dst = malloc( sizeof(*dst) ))) return NULL; - dst->sin6_family = src->sin6_family; - dst->sin6_port = src->sin6_port; - dst->sin6_flowinfo = src->sin6_flowinfo; - dst->sin6_addr = src->sin6_addr; - dst->sin6_scope_id = src->sin6_scope_id; - ret = (struct sockaddr_hdr *)dst; + struct sockaddr_in6 *netmask_addr_in6; + + if (!(netmask_addr_in6 = calloc( 1, sizeof(*netmask_addr_in6) ))) return NULL; + netmask_addr_in6->sin6_family = AF_INET6; + convert_length_to_ipv6_mask( addr->OnLinkPrefixLength, &netmask_addr_in6->sin6_addr ); + ret = (struct sockaddr *)netmask_addr_in6; break; } default: - FIXME( "address family %u not supported\n", addr->sa_family ); + FIXME( "address family %u not supported\n", addr->Address.lpSockaddr->sa_family ); return NULL; } return ret; } -static struct pcap_address *build_win32_address( struct pcap_address *src ) +static struct sockaddr *get_broadcast( const IP_ADAPTER_UNICAST_ADDRESS *addr ) { - struct pcap_address *dst; + struct sockaddr *ret; - if (!(dst = calloc( 1, sizeof(*dst) ))) return NULL; - if (src->addr && !(dst->addr = dup_sockaddr( src->addr ))) goto err; - if (src->netmask && !(dst->netmask = dup_sockaddr( src->netmask ))) goto err; - if (src->broadaddr && !(dst->broadaddr = dup_sockaddr( src->broadaddr ))) goto err; - if (src->dstaddr && !(dst->dstaddr = dup_sockaddr( src->dstaddr ))) goto err; - return dst; + switch (addr->Address.lpSockaddr->sa_family) + { + case AF_INET: + { + struct sockaddr_in *broadcast_addr_in, *addr_in = (struct sockaddr_in *)addr->Address.lpSockaddr; + ULONG netmask; + + if (!(broadcast_addr_in = calloc( 1, sizeof(*broadcast_addr_in) ))) return FALSE; + broadcast_addr_in->sin_family = AF_INET; + ConvertLengthToIpv4Mask( addr->OnLinkPrefixLength, &netmask ); + broadcast_addr_in->sin_addr.S_un.S_addr = addr_in->sin_addr.S_un.S_addr | ~netmask; + ret = (struct sockaddr *)broadcast_addr_in; + break; + } + case AF_INET6: + { + struct sockaddr_in6 *broadcast_addr_in6, *addr_in6 = (struct sockaddr_in6 *)addr->Address.lpSockaddr; + IN6_ADDR netmask, *address = (IN6_ADDR *)&addr_in6->sin6_addr; + unsigned int i; + + if (!(broadcast_addr_in6 = calloc( 1, sizeof(*broadcast_addr_in6) ))) return NULL; + broadcast_addr_in6->sin6_family = AF_INET6; + convert_length_to_ipv6_mask( addr->OnLinkPrefixLength, &netmask ); + for (i = 0; i < 8; i++) broadcast_addr_in6->sin6_addr.u.Word[i] = address->u.Word[i] | ~netmask.u.Word[i]; + ret = (struct sockaddr *)broadcast_addr_in6; + break; + } + default: + FIXME( "address family %u not supported\n", addr->Address.lpSockaddr->sa_family ); + return NULL; + } + + return ret; +} + +static struct pcap_address *build_win32_address( const IP_ADAPTER_UNICAST_ADDRESS *addr ) +{ + struct pcap_address *ret; + + if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; + if (!(ret->addr = get_address( addr ))) goto err; + if (!(ret->netmask = get_netmask( addr ))) goto err; + if (!(ret->broadaddr = get_broadcast( addr ))) goto err; + return ret; err: - free( dst->addr ); - free( dst->netmask ); - free( dst->broadaddr ); - free( dst->dstaddr ); - free( dst ); + free( ret->addr ); + free( ret->netmask ); + free( ret->broadaddr ); + free( ret ); return NULL; } @@ -303,27 +354,27 @@ static void add_win32_address( struct pcap_address **list, struct pcap_address * } } -static struct pcap_address *build_win32_addresses( struct pcap_address *addrs ) +static struct pcap_address *build_win32_addresses( const IP_ADAPTER_ADDRESSES *adapter ) { - struct pcap_address *src, *dst, *ret = NULL; - src = addrs; + struct pcap_address *dst, *ret = NULL; + IP_ADAPTER_UNICAST_ADDRESS *src = adapter->FirstUnicastAddress; while (src) { if ((dst = build_win32_address( src ))) add_win32_address( &ret, dst ); - src = src->next; + src = src->Next; } return ret; } static struct pcap_interface *build_win32_device( const struct pcap_interface *unix_dev, const char *source, - const char *adapter_name ) + const IP_ADAPTER_ADDRESSES *adapter ) { struct pcap_interface *ret; if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; - if (!(ret->name = build_win32_name( source, adapter_name ))) goto err; + if (!(ret->name = build_win32_name( source, adapter->AdapterName ))) goto err; if (!(ret->description = build_win32_description( unix_dev ))) goto err; - ret->addresses = build_win32_addresses( unix_dev->addresses ); + ret->addresses = build_win32_addresses( adapter ); ret->flags = unix_dev->flags; return ret; @@ -364,7 +415,7 @@ static int find_all_devices( const char *source, struct pcap_interface **devs, c cur = unix_devs; while (cur) { - if ((ptr = find_adapter( adapters, cur->name )) && (dev = build_win32_device( cur, source, ptr->AdapterName ))) + if ((ptr = find_adapter( adapters, cur->name )) && (dev = build_win32_device( cur, source, ptr ))) { add_win32_device( &win32_devs, dev ); }

1 0

Alex Henrie : dbghelp: Annotate allocation functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 04225e11095d6610629512bcb8632282f19683f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/04225e11095d6610629512bcb86322… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 20:47:37 2022 -0700 dbghelp: Annotate allocation functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- dlls/dbghelp/dbghelp_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 177032d0ff4..319a3b81047 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -41,9 +41,9 @@ struct pool /* poor's man */ void pool_init(struct pool* a, size_t arena_size) DECLSPEC_HIDDEN; void pool_destroy(struct pool* a) DECLSPEC_HIDDEN; -void* pool_alloc(struct pool* a, size_t len) DECLSPEC_HIDDEN; -void* pool_realloc(struct pool* a, void* ptr, size_t len) DECLSPEC_HIDDEN; -char* pool_strdup(struct pool* a, const char* str) DECLSPEC_HIDDEN; +void* pool_alloc(struct pool* a, size_t len) __WINE_ALLOC_SIZE(2) __WINE_MALLOC DECLSPEC_HIDDEN; +void* pool_realloc(struct pool* a, void* ptr, size_t len) __WINE_ALLOC_SIZE(3) DECLSPEC_HIDDEN; +char* pool_strdup(struct pool* a, const char* str) __WINE_MALLOC DECLSPEC_HIDDEN; struct vector { @@ -742,7 +742,7 @@ extern void module_reset_debug_info(struct module* module) DECLSPEC_HIDD extern BOOL module_remove(struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern void module_set_module(struct module* module, const WCHAR* name) DECLSPEC_HIDDEN; -extern WCHAR* get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; +extern WCHAR* get_wine_loader_name(struct process *pcs) __WINE_DEALLOC(HeapFree, 3) __WINE_MALLOC DECLSPEC_HIDDEN; /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, @@ -762,7 +762,7 @@ extern BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, PCSTR full_path, enum module_type type, const GUID* guid, DWORD dw1, DWORD dw2, WCHAR *buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; -extern WCHAR *get_dos_file_name(const WCHAR *filename) DECLSPEC_HIDDEN; +extern WCHAR *get_dos_file_name(const WCHAR *filename) __WINE_DEALLOC(HeapFree, 3) __WINE_MALLOC DECLSPEC_HIDDEN; extern BOOL search_dll_path(const struct process* process, const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN; extern BOOL search_unix_path(const WCHAR *name, const WCHAR *path, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN;

1 0

Alex Henrie : include: Annotate CreateThreadpool* with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 5d733044534a0c6c27d68bda599b0f7c5b20bd7d URL: https://gitlab.winehq.org/wine/wine/-/commit/5d733044534a0c6c27d68bda599b0f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 21:04:25 2022 -0700 include: Annotate CreateThreadpool* with __WINE_(DEALLOC|MALLOC). --- include/threadpoolapiset.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/threadpoolapiset.h b/include/threadpoolapiset.h index e218834726e..6d8ac44a058 100644 --- a/include/threadpoolapiset.h +++ b/include/threadpoolapiset.h @@ -33,12 +33,17 @@ WINBASEAPI void WINAPI CloseThreadpoolIo(TP_IO*); WINBASEAPI void WINAPI CloseThreadpoolTimer(PTP_TIMER); WINBASEAPI void WINAPI CloseThreadpoolWait(PTP_WAIT); WINBASEAPI void WINAPI CloseThreadpoolWork(PTP_WORK); -WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); -WINBASEAPI PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup(void); -WINBASEAPI PTP_IO WINAPI CreateThreadpoolIo(HANDLE,PTP_WIN32_IO_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); -WINBASEAPI PTP_TIMER WINAPI CreateThreadpoolTimer(PTP_TIMER_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); -WINBASEAPI PTP_WAIT WINAPI CreateThreadpoolWait(PTP_WAIT_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); -WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); +WINBASEAPI TP_POOL* WINAPI CreateThreadpool(void*) __WINE_DEALLOC(CloseThreadpool) __WINE_MALLOC; +WINBASEAPI TP_CLEANUP_GROUP* WINAPI CreateThreadpoolCleanupGroup(void) + __WINE_DEALLOC(CloseThreadpoolCleanupGroup) __WINE_MALLOC; +WINBASEAPI TP_IO* WINAPI CreateThreadpoolIo(HANDLE,PTP_WIN32_IO_CALLBACK,void*,TP_CALLBACK_ENVIRON*) + __WINE_DEALLOC(CloseThreadpoolIo) __WINE_MALLOC; +WINBASEAPI TP_TIMER* WINAPI CreateThreadpoolTimer(PTP_TIMER_CALLBACK,void*,TP_CALLBACK_ENVIRON*) + __WINE_DEALLOC(CloseThreadpoolTimer) __WINE_MALLOC; +WINBASEAPI TP_WAIT* WINAPI CreateThreadpoolWait(PTP_WAIT_CALLBACK,void*,TP_CALLBACK_ENVIRON*) + __WINE_DEALLOC(CloseThreadpoolWait) __WINE_MALLOC; +WINBASEAPI TP_WORK* WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,void*,TP_CALLBACK_ENVIRON*) + __WINE_DEALLOC(CloseThreadpoolWork) __WINE_MALLOC; WINBASEAPI void WINAPI DisassociateCurrentThreadFromCallback(PTP_CALLBACK_INSTANCE); WINBASEAPI void WINAPI FreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HMODULE); WINBASEAPI BOOL WINAPI IsThreadpoolTimerSet(PTP_TIMER);

1 0

Hans Leidekker : ncrypt: Implement NCryptSignHash().
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 6d01d014552782c55d297f5244be01a11c33d35e URL: https://gitlab.winehq.org/wine/wine/-/commit/6d01d014552782c55d297f5244be01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 23 19:10:01 2022 +0100 ncrypt: Implement NCryptSignHash(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53968 --- dlls/ncrypt/main.c | 14 ++++++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6f79985108d..fa2eff49774 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -525,6 +525,20 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name return set_object_property(object, name, input, insize); } +SECURITY_STATUS WINAPI NCryptSignHash(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *value, DWORD value_len, + BYTE *sig, DWORD sig_len, DWORD *ret_len, DWORD flags) +{ + struct object *object = (struct object *)handle; + + TRACE("(%#Ix, %p, %p, %lu, %p, %lu, %#lx)\n", handle, padding, value, value_len, sig, sig_len, flags); + if (flags & NCRYPT_SILENT_FLAG) FIXME("Silent flag not implemented\n"); + + if (!object || object->type != KEY) return NTE_INVALID_HANDLE; + + return map_ntstatus(BCryptSignHash(object->key.bcrypt_key, padding, value, value_len, sig, sig_len, + ret_len, flags & ~NCRYPT_SILENT_FLAG)); +} + SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *hash, DWORD hash_size, BYTE *signature, DWORD signature_size, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 99fb9a59ee4..f4755098429 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -91,7 +91,7 @@ @ stub NCryptSecretAgreement @ stub NCryptSetAuditingInterface @ stdcall NCryptSetProperty(ptr wstr ptr long long) -@ stub NCryptSignHash +@ stdcall NCryptSignHash(long ptr ptr long ptr long ptr long) @ stub NCryptStreamClose @ stub NCryptStreamOpenToProtect @ stub NCryptStreamOpenToUnprotect diff --git a/include/ncrypt.h b/include/ncrypt.h index bd77c692fc6..9fc2cb5b171 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -125,6 +125,7 @@ SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, D SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptSignHash(NCRYPT_KEY_HANDLE, void *, BYTE *, DWORD, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE, void *, BYTE *, DWORD, BYTE *, DWORD, DWORD); #ifdef __cplusplus

1 0

Hans Leidekker : ncrypt: Implement NCryptExportKey().
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 07f9952a2450c7d203a0b1a5c6e501cd870867ed URL: https://gitlab.winehq.org/wine/wine/-/commit/07f9952a2450c7d203a0b1a5c6e501… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 23 18:49:20 2022 +0100 ncrypt: Implement NCryptExportKey(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53966 --- dlls/ncrypt/main.c | 27 +++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 5 ++++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 89fbfcb795a..6f79985108d 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -413,6 +413,33 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return ERROR_SUCCESS; } +SECURITY_STATUS WINAPI NCryptExportKey(NCRYPT_KEY_HANDLE key, NCRYPT_KEY_HANDLE encrypt_key, const WCHAR *type, + NCryptBufferDesc *params, BYTE *output, DWORD output_len, DWORD *ret_len, + DWORD flags) +{ + struct object *object = (struct object *)key; + + TRACE("(%#Ix, %#Ix, %s, %p, %p, %lu, %p, %#lx)\n", key, encrypt_key, wine_dbgstr_w(type), params, output, + output_len, ret_len, flags); + + if (encrypt_key) + { + FIXME("Key blob encryption not implemented\n"); + return NTE_NOT_SUPPORTED; + } + if (params) + { + FIXME("Parameter information not implemented\n"); + return NTE_NOT_SUPPORTED; + } + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + + return map_ntstatus(BCryptExportKey(object->key.bcrypt_key, NULL, type, output, output_len, ret_len, 0)); +} + SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 60b367260d5..99fb9a59ee4 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -70,7 +70,7 @@ @ stdcall NCryptEnumAlgorithms(long long ptr ptr long) @ stdcall NCryptEnumKeys(long wstr ptr ptr long) @ stub NCryptEnumStorageProviders -@ stub NCryptExportKey +@ stdcall NCryptExportKey(long long wstr ptr ptr long ptr long) @ stdcall NCryptFinalizeKey(long long) @ stdcall NCryptFreeBuffer(ptr) @ stdcall NCryptFreeObject(long) diff --git a/include/ncrypt.h b/include/ncrypt.h index 18198fdc5bb..bd77c692fc6 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -110,9 +110,12 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SCARD_PIN_ID L"SmartCardPinId" #define NCRYPT_SCARD_PIN_INFO L"SmartCardPinInfo" -SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, + DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); +SECURITY_STATUS WINAPI NCryptExportKey(NCRYPT_KEY_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, BYTE *, + DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE, DWORD); SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD);

1 0

Alexandre Julliard : kernelbase: Update timezone data to version 2022g.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: a90df92a3c99d9409fb9720ba85b8781cf44bcb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a90df92a3c99d9409fb9720ba85b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 16:59:25 2022 +0100 kernelbase: Update timezone data to version 2022g. --- dlls/kernelbase/kernelbase.rgs | 17 ++++++----------- tools/make_unicode | 4 ++-- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 136744ef129..7e36eb4cf21 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -1047,9 +1047,10 @@ HKLM val 'MUI_Dlt' = s '@tzres.dll,-58097' val 'MUI_Std' = s '@tzres.dll,-58096' val 'Std' = s 'Greenland Standard Time' - val 'TZI' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 + val 'TZI' = b 7800000000000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 'Dynamic DST' { + val '2000' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2001' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060004001600000000000000 val '2002' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2003' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 @@ -1072,16 +1073,10 @@ HKLM val '2020' = b b400000000000000c4ffffff00000a0006000400170000000000000000000300060005001600000000000000 val '2021' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2022' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2023' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2024' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2025' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2026' = b b400000000000000c4ffffff00000a0006000400170000000000000000000300060005001600000000000000 - val '2027' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2028' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2029' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060004001600000000000000 - val '2030' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val 'FirstEntry' = d 2001 - val 'LastEntry' = d 2030 + val '2023' = b b400000000000000c4ffffff0000010000000100000000000000000000000300060005001600000000000000 + val '2024' = b 7800000000000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val 'FirstEntry' = d 2000 + val 'LastEntry' = d 2024 } } 'Greenwich Standard Time' diff --git a/tools/make_unicode b/tools/make_unicode index ec9647e07f4..2d1a90fafbc 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -28,7 +28,7 @@ use Time::Local qw(timegm_modern); my $UNIVERSION = "15.0.0"; my $CLDRVERSION = "42"; my $ISO639VERSION = "20220120"; -my $TZVERSION = "2022f"; +my $TZVERSION = "2022g"; my %data_files = ( @@ -55,7 +55,7 @@ my %data_files = jis0212 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0212.TXT", sha => "477820bb3055bbcc90880d788cd95607d221dc94457bae249231adecf13c12e6" }, tzdata => { url => "https://data.iana.org/time-zones/releases/tzdata$TZVERSION.tar.gz", - sha => "9990d71f675d212567b931fe8aae1cab7027f89fefb8a79d808a6933a67af000" }, + sha => "4491db8281ae94a84d939e427bdd83dc389f26764d27d9a5c52d782c16764478" }, );

1 0

Alexandre Julliard : mpg123: Import upstream release 1.31.1.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 36b0e7e0eaa1ebdc647427bb5dbab329d0e4b694 URL: https://gitlab.winehq.org/wine/wine/-/commit/36b0e7e0eaa1ebdc647427bb5dbab3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 16:44:26 2022 +0100 mpg123: Import upstream release 1.31.1. --- libs/mpg123/config.h | 31 +++++++++++++++++++++++++------ libs/mpg123/src/intsym.h | 6 +----- libs/mpg123/src/libmpg123/mpg123.h | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 5e45528c423..f030455e464 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -20,6 +20,10 @@ /* Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. */ /* #undef ASMALIGN_EXP */ +/* No suffixed symbols for large file support (only alias for backwards + compat.) */ +#define BUILD_NO_LARGENAME 1 + /* Define if __attribute__((aligned(16))) shall be used */ #define CCALIGN 1 @@ -188,6 +192,9 @@ /* Define to 1 if you have the `sched_setscheduler' function. */ /* #undef HAVE_SCHED_SETSCHEDULER */ +/* Define to 1 if you have the `setenv' function. */ +/* #undef HAVE_SETENV */ + /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 @@ -215,9 +222,6 @@ /* Define to 1 if you have the <signal.h> header file. */ #define HAVE_SIGNAL_H 1 -/* Define to 1 if you have the <sndio.h> header file. */ -/* #undef HAVE_SNDIO_H */ - /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -290,6 +294,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `unsetenv' function. */ +/* #undef HAVE_UNSETENV */ + /* Define to 1 if you have the <wchar.h> header file. */ #define HAVE_WCHAR_H 1 @@ -302,6 +309,9 @@ /* Define to 1 if you have the <wctype.h> header file. */ #define HAVE_WCTYPE_H 1 +/* Define to 1 if you have the <wincon.h> header file. */ +#define HAVE_WINCON_H 1 + /* Define to 1 if you have the <windows.h> header file. */ #define HAVE_WINDOWS_H 1 @@ -339,6 +349,15 @@ /* Define to for new net123 network stack. */ /* #undef NET123 */ +/* Define for executable-based networking (for HTTPS). */ +/* #undef NET123_EXEC */ + +/* Define for winhttp networking (for HTTPS). */ +#define NET123_WINHTTP 1 + +/* Define for wininet networking (for HTTPS). */ +/* #undef NET123_WININET */ + /* Define if network support is enabled. */ /* #undef NETWORK */ @@ -410,7 +429,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.30.2" +#define PACKAGE_STRING "mpg123 1.31.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -419,7 +438,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.30.2" +#define PACKAGE_VERSION "1.31.1" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -461,7 +480,7 @@ /* #undef USE_YASM_FOR_AVX */ /* Version number of package */ -#define VERSION "1.30.2" +#define VERSION "1.31.1" /* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 diff --git a/libs/mpg123/src/intsym.h b/libs/mpg123/src/intsym.h index 7c817e3a755..cc975d41865 100644 --- a/libs/mpg123/src/intsym.h +++ b/libs/mpg123/src/intsym.h @@ -16,6 +16,7 @@ #define compat_fdopen INT123_compat_fdopen #define compat_close INT123_compat_close #define compat_fclose INT123_compat_fclose +#define compat_binmode INT123_compat_binmode #define win32_wide_utf8 INT123_win32_wide_utf8 #define win32_wide_utf7 INT123_win32_wide_utf7 #define win32_utf8_wide INT123_win32_utf8_wide @@ -277,9 +278,6 @@ #define buffer_drop INT123_buffer_drop #define buffer_write INT123_buffer_write #define buffer_fill INT123_buffer_fill -#define read_buf INT123_read_buf -#define xfer_write_string INT123_xfer_write_string -#define xfer_read_string INT123_xfer_read_string #define xfermem_init INT123_xfermem_init #define xfermem_init_writer INT123_xfermem_init_writer #define xfermem_init_reader INT123_xfermem_init_reader @@ -304,8 +302,6 @@ #define raw_formats INT123_raw_formats #define wav_formats INT123_wav_formats #define wav_drain INT123_wav_drain -#define write_parameters INT123_write_parameters -#define read_parameters INT123_read_parameters #define stringlists_add INT123_stringlists_add #define check_neon INT123_check_neon #define dct64_3dnow INT123_dct64_3dnow diff --git a/libs/mpg123/src/libmpg123/mpg123.h b/libs/mpg123/src/libmpg123/mpg123.h index 6b96e7a50b4..19eca55ec9e 100644 --- a/libs/mpg123/src/libmpg123/mpg123.h +++ b/libs/mpg123/src/libmpg123/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.30.2) + libmpg123: MPEG Audio Decoder library (version 1.31.1) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1

1 0