December 2021 - Wine-Commits

Alexandre Julliard : ws2_32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: d3de3c584a440fe9e8b48194d3e3cd807f2e59c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3de3c584a440fe9e8b48194… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 16:15:05 2021 +0100 ws2_32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/unixlib.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 5726fc31e3e..f1f43fbdb30 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -983,3 +983,283 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unix_gethostname, unix_getnameinfo, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +struct WS_addrinfo32 +{ + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + PTR32 ai_addrlen; + PTR32 ai_canonname; + PTR32 ai_addr; + PTR32 ai_next; +}; + +struct WS_hostent32 +{ + PTR32 h_name; + PTR32 h_aliases; + short h_addrtype; + short h_length; + PTR32 h_addr_list; +}; + +static NTSTATUS put_addrinfo32( const struct WS_addrinfo *info, struct WS_addrinfo32 *info32, + unsigned int *size ) +{ + struct WS_addrinfo32 *dst = info32, *prev = NULL; + const struct WS_addrinfo *src; + unsigned int needed_size = 0; + + for (src = info; src != NULL; src = src->ai_next) + { + needed_size += sizeof(struct WS_addrinfo32); + if (src->ai_canonname) needed_size += strlen( src->ai_canonname ) + 1; + needed_size += src->ai_addrlen; + } + + if (*size < needed_size) + { + *size = needed_size; + return ERROR_INSUFFICIENT_BUFFER; + } + + memset( info32, 0, needed_size ); + + for (src = info; src != NULL; src = src->ai_next) + { + char *next = (char *)(dst + 1); + + dst->ai_flags = src->ai_flags; + dst->ai_family = src->ai_family; + dst->ai_socktype = src->ai_socktype; + dst->ai_protocol = src->ai_protocol; + if (src->ai_canonname) + { + dst->ai_canonname = PtrToUlong( next ); + strcpy( next, src->ai_canonname ); + next += strlen(next) + 1; + } + dst->ai_addrlen = src->ai_addrlen; + dst->ai_addr = PtrToUlong(next); + memcpy( next, src->ai_addr, dst->ai_addrlen ); + next += dst->ai_addrlen; + if (prev) prev->ai_next = PtrToUlong(dst); + prev = dst; + dst = (struct WS_addrinfo32 *)next; + } + return STATUS_SUCCESS; +} + +static NTSTATUS put_hostent32( const struct WS_hostent *host, struct WS_hostent32 *host32, + unsigned int *size ) +{ + unsigned int needed_size = sizeof( struct WS_hostent32 ), alias_count = 0, addr_count = 0, i; + char *p; + ULONG *aliases, *addr_list; + + needed_size += strlen( host->h_name ) + 1; + + for (alias_count = 0; host->h_aliases[alias_count] != NULL; ++alias_count) + needed_size += sizeof(ULONG) + strlen( host->h_aliases[alias_count] ) + 1; + needed_size += sizeof(ULONG); /* null terminator */ + + for (addr_count = 0; host->h_addr_list[addr_count] != NULL; ++addr_count) + needed_size += sizeof(ULONG) + host->h_length; + needed_size += sizeof(ULONG); /* null terminator */ + + if (*size < needed_size) + { + *size = needed_size; + return ERROR_INSUFFICIENT_BUFFER; + } + + memset( host32, 0, needed_size ); + + /* arrange the memory in the same order as windows >= XP */ + + host32->h_addrtype = host->h_addrtype; + host32->h_length = host->h_length; + + aliases = (ULONG *)(host32 + 1); + addr_list = aliases + alias_count + 1; + p = (char *)(addr_list + addr_count + 1); + + host32->h_aliases = PtrToUlong( aliases ); + host32->h_addr_list = PtrToUlong( addr_list ); + + for (i = 0; i < addr_count; ++i) + { + addr_list[i] = PtrToUlong( p ); + memcpy( p, host->h_addr_list[i], host->h_length ); + p += host->h_length; + } + + for (i = 0; i < alias_count; ++i) + { + size_t len = strlen( host->h_aliases[i] ) + 1; + + aliases[i] = PtrToUlong( p ); + memcpy( p, host->h_aliases[i], len ); + p += len; + } + + host32->h_name = PtrToUlong( p ); + strcpy( p, host->h_name ); + return STATUS_SUCCESS; +} + + +static NTSTATUS wow64_unix_getaddrinfo( void *args ) +{ + struct + { + PTR32 node; + PTR32 service; + PTR32 hints; + PTR32 info; + PTR32 size; + } const *params32 = args; + + NTSTATUS status; + struct WS_addrinfo hints; + struct getaddrinfo_params params = + { + ULongToPtr( params32->node ), + ULongToPtr( params32->service ), + NULL, + NULL, + ULongToPtr(params32->size) + }; + + if (params32->hints) + { + const struct WS_addrinfo32 *hints32 = ULongToPtr(params32->hints); + hints.ai_flags = hints32->ai_flags; + hints.ai_family = hints32->ai_family; + hints.ai_socktype = hints32->ai_socktype; + hints.ai_protocol = hints32->ai_protocol; + params.hints = &hints; + } + + if (!(params.info = malloc( *params.size ))) return WSAENOBUFS; + status = unix_getaddrinfo( &params ); + if (!status) put_addrinfo32( params.info, ULongToPtr(params32->info), ULongToPtr(params32->size) ); + free( params.info ); + return status; +} + + +static NTSTATUS wow64_unix_gethostbyaddr( void *args ) +{ + struct + { + PTR32 addr; + int len; + int family; + PTR32 host; + PTR32 size; + } const *params32 = args; + + NTSTATUS status; + struct gethostbyaddr_params params = + { + ULongToPtr( params32->addr ), + params32->len, + params32->family, + NULL, + ULongToPtr(params32->size) + }; + + if (!(params.host = malloc( *params.size ))) return WSAENOBUFS; + status = unix_gethostbyaddr( &params ); + if (!status) + status = put_hostent32( params.host, ULongToPtr(params32->host), ULongToPtr(params32->size) ); + free( params.host ); + return status; +} + + +static NTSTATUS wow64_unix_gethostbyname( void *args ) +{ + struct + { + PTR32 name; + PTR32 host; + PTR32 size; + } const *params32 = args; + + NTSTATUS status; + struct gethostbyname_params params = + { + ULongToPtr( params32->name ), + NULL, + ULongToPtr(params32->size) + }; + + if (!(params.host = malloc( *params.size ))) return WSAENOBUFS; + status = unix_gethostbyname( &params ); + if (!status) + status = put_hostent32( params.host, ULongToPtr(params32->host), ULongToPtr(params32->size) ); + free( params.host ); + return status; +} + + +static NTSTATUS wow64_unix_gethostname( void *args ) +{ + struct + { + PTR32 name; + unsigned int size; + } const *params32 = args; + + struct gethostname_params params = { ULongToPtr(params32->name), params32->size }; + + if (!unix_gethostname( &params )) return 0; + return errno_from_unix( errno ); +} + + +static NTSTATUS wow64_unix_getnameinfo( void *args ) +{ + struct + { + PTR32 addr; + int addr_len; + PTR32 host; + DWORD host_len; + PTR32 serv; + DWORD serv_len; + unsigned int flags; + } const *params32 = args; + + struct getnameinfo_params params = + { + ULongToPtr( params32->addr ), + params32->addr_len, + ULongToPtr( params32->host ), + params32->host_len, + ULongToPtr( params32->serv ), + params32->serv_len, + params32->flags + }; + + return unix_getnameinfo( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_unix_getaddrinfo, + wow64_unix_gethostbyaddr, + wow64_unix_gethostbyname, + wow64_unix_gethostname, + wow64_unix_getnameinfo, +}; + +#endif /* _WIN64 */

1 0

Alexandre Julliard : ws2_32: Fix a potential buffer overflow in the Unix interface.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 74045dc812eea94a15d89871d8b3f3038fc30e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74045dc812eea94a15d89871… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 16:14:12 2021 +0100 ws2_32: Fix a potential buffer overflow in the Unix interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 67edf06368e..5726fc31e3e 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -783,7 +783,7 @@ static int hostent_from_unix( const struct hostent *unix_host, struct WS_hostent unsigned int needed_size = sizeof( struct WS_hostent ), alias_count = 0, addr_count = 0, i; char *p; - needed_size += strlen( unix_host->h_name ); + needed_size += strlen( unix_host->h_name ) + 1; for (alias_count = 0; unix_host->h_aliases[alias_count] != NULL; ++alias_count) needed_size += sizeof(char *) + strlen( unix_host->h_aliases[alias_count] ) + 1;

1 0

Damjan Jovanovic : server: FreeBSD 14-CURRENT's sched_setaffinity() needs _WITH_CPU_SET_T defined.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 316a358b0f718d4c81d331993ebc22543c029bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=316a358b0f718d4c81d33199… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Dec 6 03:52:13 2021 +0200 server: FreeBSD 14-CURRENT's sched_setaffinity() needs _WITH_CPU_SET_T defined. FreeBSD 14-CURRENT got the non-standard sched_setaffinity() function, but it uses FreeBSD's cpuset_t type instead of Linux's cpu_set_t (also non-standard). This breaks the build. We have to define _WITH_CPU_SET_T before including <sched.h> to get that type named cpu_set_t instead. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/thread.c b/server/thread.c index e9240a05659..296f7a5d265 100644 --- a/server/thread.c +++ b/server/thread.c @@ -33,6 +33,8 @@ #include <time.h> #include <poll.h> #ifdef HAVE_SCHED_H +/* FreeBSD needs this for cpu_set_t intead of its cpuset_t */ +#define _WITH_CPU_SET_T #include <sched.h> #endif

1 0

Eric Pouech : winedbg: Make pid and tid internal variables DWORDs.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: ac3ee768c3ef6b64c5cd57c1a927e66dfd3ce95a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3ee768c3ef6b64c5cd57c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:33 2021 +0100 winedbg: Make pid and tid internal variables DWORDs. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/stack.c | 2 +- programs/winedbg/tgt_active.c | 6 +++--- programs/winedbg/winedbg.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 837384c21a8..1d3156bf8a3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -245,9 +245,9 @@ struct be_process_io }; extern struct dbg_process* dbg_curr_process; -extern DWORD_PTR dbg_curr_pid; +extern DWORD dbg_curr_pid; extern struct dbg_thread* dbg_curr_thread; -extern DWORD_PTR dbg_curr_tid; +extern DWORD dbg_curr_tid; extern dbg_ctx_t dbg_context; extern BOOL dbg_interactiveP; extern HANDLE dbg_houtput; diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 34ca6c985be..34089bcde04 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -409,7 +409,7 @@ static void backtrace_all(void) dbg_active_wait_for_first_exception(); } - dbg_printf("\nBacktracing for thread %04x in process %04Ix (%s):\n", + dbg_printf("\nBacktracing for thread %04x in process %04x (%s):\n", entry.th32ThreadID, dbg_curr_pid, dbg_W2A(dbg_curr_process->imageName, -1)); backtrace_tid(dbg_curr_process, entry.th32ThreadID); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 0993bddc985..70ad7e8b437 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -370,7 +370,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) size = ARRAY_SIZE(u.buffer); if (!QueryFullProcessImageNameW( dbg_curr_process->handle, 0, u.buffer, &size )) { - swprintf( u.buffer, ARRAY_SIZE(u.buffer), L"Process_%08x", dbg_curr_pid); + swprintf(u.buffer, ARRAY_SIZE(u.buffer), L"Process_%08x", dbg_curr_pid); } WINE_TRACE("%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", @@ -537,12 +537,12 @@ static void dbg_resume_debuggee(DWORD cont) if (dbg_curr_thread) { if (!dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context)) - dbg_printf("Cannot set ctx on %04Ix\n", dbg_curr_tid); + dbg_printf("Cannot set ctx on %04x\n", dbg_curr_tid); } } dbg_interactiveP = FALSE; if (!ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, cont)) - dbg_printf("Cannot continue on %04Ix (%08x)\n", dbg_curr_tid, cont); + dbg_printf("Cannot continue on %04x (%08x)\n", dbg_curr_tid, cont); } static void wait_exception(void) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 803a26f1e55..283b126ba84 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -77,8 +77,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); struct dbg_process* dbg_curr_process = NULL; struct dbg_thread* dbg_curr_thread = NULL; -DWORD_PTR dbg_curr_tid = 0; -DWORD_PTR dbg_curr_pid = 0; +DWORD dbg_curr_tid = 0; +DWORD dbg_curr_pid = 0; dbg_ctx_t dbg_context; BOOL dbg_interactiveP = FALSE; HANDLE dbg_houtput = 0; @@ -569,7 +569,7 @@ void dbg_start_interactive(const char* filename, HANDLE hFile) if (dbg_curr_process) { - dbg_printf("WineDbg starting on pid %04Ix\n", dbg_curr_pid); + dbg_printf("WineDbg starting on pid %04x\n", dbg_curr_pid); if (dbg_curr_process->active_debuggee) dbg_active_wait_for_first_exception(); }

1 0

Jacek Caban : win32u: Fix return types on lock_display_devices failures.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: ed275327888b2223f1e63b211556e13f8bdcd612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed275327888b2223f1e63b21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:28:15 2021 +0100 win32u: Fix return types on lock_display_devices failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 56523210bdf..5c65dce716d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1528,14 +1528,16 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in if (flags != QDC_ONLY_ACTIVE_PATHS) FIXME( "only returning active paths\n" ); - if (!lock_display_devices()) return FALSE; - LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + if (lock_display_devices()) { - if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; - count++; + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + { + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + count++; + } + unlock_display_devices(); } - unlock_display_devices(); *num_path_info = count; *num_mode_info = count * 2; @@ -1715,7 +1717,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm return ret; } - if (!lock_display_devices()) return FALSE; + if (!lock_display_devices()) return DISP_CHANGE_FAILED; if ((adapter = find_adapter( devname ))) lstrcpyW( device_name, adapter->dev.device_name ); unlock_display_devices(); if (!adapter)

1 0

Alexandre Julliard : ntdll: Don't return a default Unix handle for modules that don't have a Unix library.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 456e76185d0ba5895fd2b498ec5534cc9f27f935 URL: https://source.winehq.org/git/wine.git/?a=commit;h=456e76185d0ba5895fd2b498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 15:10:41 2021 +0100 ntdll: Don't return a default Unix handle for modules that don't have a Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 5873a3e2335..259968a890c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -655,8 +655,11 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - *funcs = dlsym( builtin->unix_handle, ptr_name ); - status = *funcs ? STATUS_SUCCESS : STATUS_ENTRYPOINT_NOT_FOUND; + if (builtin->unix_handle) + { + *funcs = dlsym( builtin->unix_handle, ptr_name ); + status = *funcs ? STATUS_SUCCESS : STATUS_ENTRYPOINT_NOT_FOUND; + } break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Alexandre Julliard : crypt32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: b52c6bfbb138ea2e516c757710ad7272c40b74ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52c6bfbb138ea2e516c7577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 17:54:01 2021 +0100 crypt32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32_private.h | 10 ++-- dlls/crypt32/pfx.c | 4 +- dlls/crypt32/unixlib.c | 121 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 122 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 7fed1665d56..f4131bf2694 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -461,25 +461,25 @@ void init_empty_store(void) DECLSPEC_HIDDEN; /* Unix interface */ -struct cert_store_data; +typedef UINT64 cert_store_data_t; struct open_cert_store_params { CRYPT_DATA_BLOB *pfx; const WCHAR *password; - struct cert_store_data **data_ret; + cert_store_data_t *data_ret; }; struct import_store_key_params { - struct cert_store_data *data; + cert_store_data_t data; void *buf; DWORD *buf_size; }; struct import_store_cert_params { - struct cert_store_data *data; + cert_store_data_t data; unsigned int index; void *buf; DWORD *buf_size; @@ -487,7 +487,7 @@ struct import_store_cert_params struct close_cert_store_params { - struct cert_store_data *data; + cert_store_data_t data; }; struct enum_root_certs_params diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 1dd048c2b67..ca29c2aadfc 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); -static HCRYPTPROV import_key( struct cert_store_data *data, DWORD flags ) +static HCRYPTPROV import_key( cert_store_data_t data, DWORD flags ) { HCRYPTPROV prov = 0; HCRYPTKEY cryptkey; @@ -145,7 +145,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor DWORD i = 0, size; HCERTSTORE store = NULL; HCRYPTPROV prov = 0; - struct cert_store_data *data = NULL; + cert_store_data_t data = 0; struct open_cert_store_params open_params = { pfx, password, &data }; struct close_cert_store_params close_params; diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 7cb521eb98b..a345b5e6ac8 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -161,10 +161,15 @@ struct cert_store_data unsigned int chain_len; }; +static struct cert_store_data *get_store_data( cert_store_data_t data ) +{ + return (struct cert_store_data *)(ULONG_PTR)data; +} + static NTSTATUS import_store_key( void *args ) { struct import_store_key_params *params = args; - struct cert_store_data *data = params->data; + struct cert_store_data *data = get_store_data( params->data ); int i, ret; unsigned int bitlen = data->key_bitlen; gnutls_datum_t m, e, d, p, q, u, e1, e2; @@ -303,7 +308,7 @@ static NTSTATUS open_cert_store( void *args ) store_data->chain = chain; store_data->key_bitlen = bitlen; store_data->chain_len = chain_len; - *params->data_ret = store_data; + *params->data_ret = (ULONG_PTR)store_data; return STATUS_SUCCESS; error: @@ -316,7 +321,7 @@ error: static NTSTATUS import_store_cert( void *args ) { struct import_store_cert_params *params = args; - struct cert_store_data *data = params->data; + struct cert_store_data *data = get_store_data( params->data ); size_t size = 0; int ret; @@ -339,11 +344,12 @@ static NTSTATUS import_store_cert( void *args ) static NTSTATUS close_cert_store( void *args ) { struct close_cert_store_params *params = args; + struct cert_store_data *data = get_store_data( params->data ); if (params->data) { - pgnutls_pkcs12_deinit( params->data->p12 ); - free( params->data ); + pgnutls_pkcs12_deinit( data->p12 ); + free( data ); } return STATUS_SUCCESS; } @@ -678,7 +684,7 @@ static NTSTATUS enum_root_certs( void *args ) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { process_attach, process_detach, @@ -688,3 +694,106 @@ unixlib_entry_t __wine_unix_call_funcs[] = close_cert_store, enum_root_certs, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +typedef struct +{ + DWORD cbData; + PTR32 pbData; +} CRYPT_DATA_BLOB32; + +static NTSTATUS wow64_open_cert_store( void *args ) +{ + struct + { + PTR32 pfx; + PTR32 password; + PTR32 data_ret; + } const *params32 = args; + + const CRYPT_DATA_BLOB32 *pfx32 = ULongToPtr( params32->pfx ); + CRYPT_DATA_BLOB pfx = { pfx32->cbData, ULongToPtr( pfx32->pbData ) }; + struct open_cert_store_params params = + { + &pfx, + ULongToPtr( params32->password ), + ULongToPtr( params32->data_ret ) + }; + + return open_cert_store( &params ); +} + +static NTSTATUS wow64_import_store_key( void *args ) +{ + struct + { + cert_store_data_t data; + PTR32 buf; + PTR32 buf_size; + } const *params32 = args; + + struct import_store_key_params params = + { + params32->data, + ULongToPtr( params32->buf ), + ULongToPtr( params32->buf_size ) + }; + + return import_store_key( &params ); +} + +static NTSTATUS wow64_import_store_cert( void *args ) +{ + struct + { + cert_store_data_t data; + unsigned int index; + PTR32 buf; + PTR32 buf_size; + } const *params32 = args; + + struct import_store_cert_params params = + { + params32->data, + params32->index, + ULongToPtr( params32->buf ), + ULongToPtr( params32->buf_size ) + }; + + return import_store_cert( &params ); +} + +static NTSTATUS wow64_enum_root_certs( void *args ) +{ + struct + { + PTR32 buffer; + DWORD size; + PTR32 needed; + } const *params32 = args; + + struct enum_root_certs_params params = + { + ULongToPtr( params32->buffer ), + params32->size, + ULongToPtr( params32->needed ) + }; + + return enum_root_certs( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + process_detach, + wow64_open_cert_store, + wow64_import_store_key, + wow64_import_store_cert, + close_cert_store, + wow64_enum_root_certs, +}; + +#endif /* _WIN64 */

1 0

Nikolay Sivov : dwrite: Remove unixlib callbacks.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 06742814ed08c65c6466f459bfd46d8fdfd0eb13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06742814ed08c65c6466f459… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:47 2021 +0300 dwrite: Remove unixlib callbacks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 8 ---- dlls/dwrite/font.c | 74 +---------------------------------- dlls/dwrite/freetype.c | 93 +------------------------------------------- 3 files changed, 3 insertions(+), 172 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1ac50747ec6..f83372acc9e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -717,18 +717,10 @@ extern HRESULT shape_check_typographic_feature(struct scriptshaping_context *con struct font_data_context; extern HMODULE dwrite_module DECLSPEC_HIDDEN; -struct font_callback_funcs -{ - int (CDECL *get_font_data)(void *key, const void **data_ptr, UINT64 *data_size, unsigned int *index, - struct font_data_context **context); - void (CDECL *release_font_data)(struct font_data_context *context); -}; - struct font_backend_funcs { font_object_handle (CDECL *create_font_object)(const void *data_ptr, UINT64 data_size, unsigned int index); void (CDECL *release_font_object)(font_object_handle object); - void (CDECL *notify_release)(void *key); int (CDECL *get_glyph_outline)(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); UINT16 (CDECL *get_glyph_count)(font_object_handle object); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 05aea75d52d..cb4f856524c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -837,7 +837,6 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) for (i = 0; i < ARRAY_SIZE(fontface->glyphs); i++) free(fontface->glyphs[i]); - font_funcs->notify_release(iface); font_funcs->release_font_object(fontface->font_object); if (fontface->stream) { @@ -8142,81 +8141,12 @@ HRESULT create_fontset_builder(IDWriteFactory7 *factory, IDWriteFontSetBuilder2 return S_OK; } -struct font_data_context -{ - IDWriteFontFileStream *stream; - void *context; -}; - -static int CDECL get_font_data_cb(void *key, const void **data_ptr, UINT64 *data_size, - unsigned int *index, struct font_data_context **ret_context) -{ - IDWriteFontFace *fontface = key; - struct font_data_context *context; - IDWriteFontFileStream *stream; - IDWriteFontFile *file; - unsigned int count; - void *data_context; - HRESULT hr; - - *ret_context = NULL; - - count = 1; - if (FAILED(IDWriteFontFace_GetFiles(fontface, &count, &file))) return 1; - - hr = get_filestream_from_file(file, &stream); - IDWriteFontFile_Release(file); - if (FAILED(hr)) return 1; - - hr = IDWriteFontFileStream_GetFileSize(stream, data_size); - if (FAILED(hr)) - { - IDWriteFontFileStream_Release(stream); - return 1; - } - - hr = IDWriteFontFileStream_ReadFileFragment(stream, data_ptr, 0, *data_size, &data_context); - if (FAILED(hr)) - { - IDWriteFontFileStream_Release(stream); - return 1; - } - - if (!(context = malloc(sizeof(*context)))) - { - IDWriteFontFileStream_Release(stream); - return 1; - } - - context->stream = stream; - context->context = data_context; - - *ret_context = context; - *index = IDWriteFontFace_GetIndex(fontface); - - return 0; -} - -static void CDECL release_font_data_cb(struct font_data_context *context) -{ - if (!context) return; - IDWriteFontFileStream_ReleaseFileFragment(context->stream, context->context); - IDWriteFontFileStream_Release(context->stream); - free(context); -} - -struct font_callback_funcs callback_funcs = -{ - get_font_data_cb, - release_font_data_cb, -}; - void init_font_backend(void) { - __wine_init_unix_lib(dwrite_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs); + __wine_init_unix_lib(dwrite_module, DLL_PROCESS_ATTACH, NULL, &font_funcs); } void release_font_backend(void) { - __wine_init_unix_lib(dwrite_module, DLL_PROCESS_DETACH, &callback_funcs, NULL); + __wine_init_unix_lib(dwrite_module, DLL_PROCESS_DETACH, NULL, NULL); } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3b9676a1af1..daaff6a3f8c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -29,7 +29,7 @@ #ifdef HAVE_FT2BUILD_H #include <ft2build.h> -#include FT_CACHE_H +#include FT_GLYPH_H #include FT_FREETYPE_H #include FT_OUTLINE_H #include FT_TRUETYPE_TABLES_H @@ -47,19 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -static RTL_CRITICAL_SECTION freetype_cs; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &freetype_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": freetype_cs") } -}; -static RTL_CRITICAL_SECTION freetype_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - static void *ft_handle = NULL; static FT_Library library = 0; -static FTC_Manager cache_manager = 0; -static FTC_ImageCache image_cache = 0; typedef struct { FT_Int major; @@ -67,8 +56,6 @@ typedef struct FT_Int patch; } FT_Version_t; -static const struct font_callback_funcs *callback_funcs; - #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Activate_Size); MAKE_FUNCPTR(FT_Done_Face); @@ -98,53 +85,9 @@ MAKE_FUNCPTR(FT_Outline_New); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); -MAKE_FUNCPTR(FTC_ImageCache_Lookup); -MAKE_FUNCPTR(FTC_ImageCache_New); -MAKE_FUNCPTR(FTC_Manager_New); -MAKE_FUNCPTR(FTC_Manager_Done); -MAKE_FUNCPTR(FTC_Manager_LookupFace); -MAKE_FUNCPTR(FTC_Manager_LookupSize); -MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR static FT_Error (*pFT_Outline_EmboldenXY)(FT_Outline *, FT_Pos, FT_Pos); -static void face_finalizer(void *object) -{ - FT_Face face = object; - callback_funcs->release_font_data((struct font_data_context *)face->generic.data); -} - -static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face) -{ - struct font_data_context *context; - const void *data_ptr; - FT_Error fterror; - UINT64 data_size; - UINT32 index; - - *face = NULL; - - if (!face_id) - { - WARN("NULL fontface requested.\n"); - return FT_Err_Ok; - } - - if (callback_funcs->get_font_data(face_id, &data_ptr, &data_size, &index, &context)) - return FT_Err_Ok; - - fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face); - if (fterror == FT_Err_Ok) - { - (*face)->generic.data = context; - (*face)->generic.finalizer = face_finalizer; - } - else - callback_funcs->release_font_data(context); - - return fterror; -} - static FT_Size freetype_set_face_size(FT_Face face, FT_UInt emsize) { FT_Size size; @@ -207,13 +150,6 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) - LOAD_FUNCPTR(FTC_ImageCache_Lookup) - LOAD_FUNCPTR(FTC_ImageCache_New) - LOAD_FUNCPTR(FTC_Manager_New) - LOAD_FUNCPTR(FTC_Manager_Done) - LOAD_FUNCPTR(FTC_Manager_LookupFace) - LOAD_FUNCPTR(FTC_Manager_LookupSize) - LOAD_FUNCPTR(FTC_Manager_RemoveFaceID) #undef LOAD_FUNCPTR pFT_Outline_EmboldenXY = dlsym(ft_handle, "FT_Outline_EmboldenXY"); @@ -225,18 +161,6 @@ static BOOL init_freetype(void) } pFT_Library_Version(library, &FT_Version.major, &FT_Version.minor, &FT_Version.patch); - /* init cache manager */ - if (pFTC_Manager_New(library, 0, 0, 0, &face_requester, NULL, &cache_manager) != 0 || - pFTC_ImageCache_New(cache_manager, &image_cache) != 0) { - - ERR("Failed to init FreeType cache\n"); - pFTC_Manager_Done(cache_manager); - pFT_Done_FreeType(library); - dlclose(ft_handle); - ft_handle = NULL; - return FALSE; - } - TRACE("FreeType version is %d.%d.%d\n", FT_Version.major, FT_Version.minor, FT_Version.patch); return TRUE; @@ -264,13 +188,6 @@ static void CDECL freetype_release_font_object(font_object_handle object) pFT_Done_Face(object); } -static void CDECL freetype_notify_release(void *key) -{ - RtlEnterCriticalSection(&freetype_cs); - pFTC_Manager_RemoveFaceID(cache_manager, key); - RtlLeaveCriticalSection(&freetype_cs); -} - static void CDECL freetype_get_design_glyph_metrics(font_object_handle object, UINT16 upem, UINT16 ascent, unsigned int simulations, UINT16 glyph, DWRITE_GLYPH_METRICS *ret) { @@ -793,7 +710,6 @@ const static struct font_backend_funcs freetype_funcs = { freetype_create_font_object, freetype_release_font_object, - freetype_notify_release, freetype_get_glyph_outline, freetype_get_glyph_count, freetype_get_glyph_advance, @@ -804,7 +720,6 @@ const static struct font_backend_funcs freetype_funcs = static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { - callback_funcs = ptr_in; if (!init_freetype()) return STATUS_DLL_NOT_FOUND; *(const struct font_backend_funcs **)ptr_out = &freetype_funcs; return STATUS_SUCCESS; @@ -812,7 +727,6 @@ static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_ static NTSTATUS release_freetype_lib(void) { - pFTC_Manager_Done(cache_manager); pFT_Done_FreeType(library); return STATUS_SUCCESS; } @@ -828,10 +742,6 @@ static void CDECL null_release_font_object(font_object_handle object) { } -static void CDECL null_notify_release(void *key) -{ -} - static int CDECL null_get_glyph_outline(font_object_handle object, float emSize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline) { @@ -869,7 +779,6 @@ const static struct font_backend_funcs null_funcs = { null_create_font_object, null_release_font_object, - null_notify_release, null_get_glyph_outline, null_get_glyph_count, null_get_glyph_advance,

1 0

Nikolay Sivov : dwrite: Move bitmap cache to PE side.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: b1dc908aa59f43e34b91c12fd13dd84f741db47a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1dc908aa59f43e34b91c12f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:46 2021 +0300 dwrite: Move bitmap cache to PE side. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 103 +++++++++++++++++++++++++++++-------------- dlls/dwrite/freetype.c | 53 ++++++++-------------- 3 files changed, 90 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1dc908aa59f43e34b91…

1 0

Nikolay Sivov : dwrite: Move glyph box cache to PE side.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: b3ad9000c04c5e57d65d955c1669402fb617c79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3ad9000c04c5e57d65d955c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:45 2021 +0300 dwrite: Move glyph box cache to PE side. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 96 ++++++++++++++++++++++++++------------------ dlls/dwrite/freetype.c | 58 +++++++++++++------------- 3 files changed, 88 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3ad9000c04c5e57d65d…

1 0