November 2021 - Wine-commits

Stefan Dösinger : include: _InterlockedExchangePointer is an intrinsic on x86 in newer MSVC versions.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: ad05f33d676ff43484a8bdcffa7122280d1bd10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad05f33d676ff43484a8bdcf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 8 16:39:01 2021 +0300 include: _InterlockedExchangePointer is an intrinsic on x86 in newer MSVC versions. msvc 2019 complains that _InterlockedCompareExchangePointer and _InterlockedExchangePointer are intrinsics and cannot be defined even when building for x86. If I read Microsoft's header right that started with msvc 2016. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index ef731e29c52..3e8a92fc063 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6345,7 +6345,7 @@ long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); -#ifndef __i386__ +#if !defined(__i386__) || _MSC_VER >= 1600 #pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedExchangePointer)

1 0

Alexandre Julliard : avicap32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 9f69a0ddaa2f33cf42fc0bd489f189f6c222ceab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f69a0ddaa2f33cf42fc0bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:53:24 2021 +0100 avicap32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/v4l.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index 0b004e17e58..ef41b7e281b 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -134,4 +134,13 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_device_desc, }; +#ifdef _WIN64 + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + get_device_desc, +}; + +#endif /* _WIN64 */ + #endif /* HAVE_LINUX_VIDEODEV_2 */

1 0

Alexandre Julliard : ctapi32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: fc67bbf27fbcd5d32a373b599e038fab069d9177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc67bbf27fbcd5d32a373b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:53:51 2021 +0100 ctapi32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/ctapi32.c | 4 +--- dlls/ctapi32/unixlib.c | 54 ++++++++++++++++++++++++++++++++++++++++++++------ dlls/ctapi32/unixlib.h | 5 ----- 3 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 471da7bbd14..5d5060ace47 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -38,7 +38,6 @@ static unixlib_handle_t ctapi_handle; static BOOL load_functions(void) { - struct attach_params params; char soname[MAX_PATH] = FALLBACK_LIBCTAPI; LONG result; HKEY key_handle; @@ -61,8 +60,7 @@ static BOOL load_functions(void) { } TRACE("Loading library '%s'\n", soname); - params.libname = soname; - if (!CTAPI_CALL( attach, &params )) return TRUE; + if (!CTAPI_CALL( attach, soname )) return TRUE; MESSAGE("Wine cannot find any usable hardware library, ctapi32.dll not working.\n"); MESSAGE("Please create the key \"HKEY_CURRENT_USER\\Software\\Wine\\ctapi32\" in your registry\n"); diff --git a/dlls/ctapi32/unixlib.c b/dlls/ctapi32/unixlib.c index a31c0a13c30..cdfe6e6eb73 100644 --- a/dlls/ctapi32/unixlib.c +++ b/dlls/ctapi32/unixlib.c @@ -40,9 +40,9 @@ static void *ctapi_handle; static NTSTATUS attach( void *args ) { - struct attach_params *params = args; + const char *libname = args; - if (!(ctapi_handle = dlopen( params->libname, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; + if (!(ctapi_handle = dlopen( libname, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; #define LOAD_FUNCPTR(f) if((p##f = dlsym(ctapi_handle, #f)) == NULL) return STATUS_ENTRYPOINT_NOT_FOUND LOAD_FUNCPTR(CT_init); @@ -60,14 +60,14 @@ static NTSTATUS detach( void *args ) static NTSTATUS ct_init( void *args ) { - struct ct_init_params *params = args; + const struct ct_init_params *params = args; return pCT_init(params->ctn, params->pn); } static NTSTATUS ct_data( void *args ) { - struct ct_data_params *params = args; + const struct ct_data_params *params = args; return pCT_data(params->ctn, params->dad, params->sad, params->lenc, params->command, params->lenr, params->response); @@ -75,12 +75,12 @@ static NTSTATUS ct_data( void *args ) static NTSTATUS ct_close( void *args ) { - struct ct_close_params *params = args; + const struct ct_close_params *params = args; return pCT_close(params->ctn); } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { attach, detach, @@ -88,3 +88,45 @@ unixlib_entry_t __wine_unix_call_funcs[] = ct_data, ct_close, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_ct_data( void *args ) +{ + struct + { + IU16 ctn; + PTR32 dad; + PTR32 sad; + IU16 lenc; + PTR32 command; + PTR32 lenr; + PTR32 response; + } const *params32 = args; + + struct ct_data_params params = + { + params32->ctn, + ULongToPtr(params32->dad), + ULongToPtr(params32->sad), + params32->lenc, + ULongToPtr(params32->command), + ULongToPtr(params32->lenr), + ULongToPtr(params32->response) + }; + + return ct_data( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + attach, + detach, + ct_init, + wow64_ct_data, + ct_close, +}; + +#endif /* _WIN64 */ diff --git a/dlls/ctapi32/unixlib.h b/dlls/ctapi32/unixlib.h index 05301b99fcf..535c2aeae09 100644 --- a/dlls/ctapi32/unixlib.h +++ b/dlls/ctapi32/unixlib.h @@ -31,11 +31,6 @@ typedef unsigned short IU16; typedef signed char IS8; typedef signed short IS16; -struct attach_params -{ - const char *libname; -}; - struct ct_init_params { IU16 ctn;

1 0

Alexandre Julliard : dnsapi: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: c78fce9e5b85780c1825667c4f4a99702be4fcbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c78fce9e5b85780c1825667c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:16 2021 +0100 dnsapi: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 5 --- dlls/dnsapi/libresolv.c | 86 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/dnsapi/query.c | 3 +- 3 files changed, 80 insertions(+), 14 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index af3dee45bb9..f27cce9a99d 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -139,11 +139,6 @@ struct get_serverlist_params DWORD *len; }; -struct set_serverlist_params -{ - const IP4_ARRAY *addrs; -}; - struct query_params { const char *name; diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 9e12683b8a8..0871348fb22 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -124,7 +124,7 @@ static DNS_STATUS map_h_errno( int error ) static NTSTATUS resolv_get_searchlist( void *args ) { - struct get_searchlist_params *params = args; + const struct get_searchlist_params *params = args; DNS_TXT_DATAW *list = params->list; DWORD i, needed, str_needed = 0; char *ptr, *end; @@ -170,7 +170,7 @@ static inline int filter( unsigned short sin_family, USHORT family ) static NTSTATUS resolv_get_serverlist( void *args ) { - struct get_serverlist_params *params = args; + const struct get_serverlist_params *params = args; DNS_ADDR_ARRAY *addrs = params->addrs; struct __res_state *state = &_res; DWORD i, found, total, needed; @@ -238,7 +238,7 @@ static NTSTATUS resolv_get_serverlist( void *args ) static NTSTATUS resolv_get_serverlist( void *args ) { - struct get_serverlist_params *params = args; + const struct get_serverlist_params *params = args; DNS_ADDR_ARRAY *addrs = params->addrs; DWORD needed, found, i; @@ -305,8 +305,7 @@ static NTSTATUS resolv_get_serverlist( void *args ) static NTSTATUS resolv_set_serverlist( void *args ) { - struct set_serverlist_params *params = args; - const IP4_ARRAY *addrs = params->addrs; + const IP4_ARRAY *addrs = args; int i; init_resolver(); @@ -328,7 +327,7 @@ static NTSTATUS resolv_set_serverlist( void *args ) static NTSTATUS resolv_query( void *args ) { - struct query_params *params = args; + const struct query_params *params = args; DNS_STATUS ret = ERROR_SUCCESS; int len; @@ -342,7 +341,7 @@ static NTSTATUS resolv_query( void *args ) return ret; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { resolv_get_searchlist, resolv_get_serverlist, @@ -350,4 +349,77 @@ unixlib_entry_t __wine_unix_call_funcs[] = resolv_query, }; +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_resolv_get_searchlist( void *args ) +{ + struct + { + PTR32 list; + PTR32 len; + } const *params32 = args; + + struct get_searchlist_params params = + { + ULongToPtr(params32->list), + ULongToPtr(params32->len) + }; + + return resolv_get_searchlist( &params ); +} + +static NTSTATUS wow64_resolv_get_serverlist( void *args ) +{ + struct + { + USHORT family; + PTR32 addrs; + PTR32 len; + } const *params32 = args; + + struct get_serverlist_params params = + { + params32->family, + ULongToPtr(params32->addrs), + ULongToPtr(params32->len) + }; + + return resolv_get_serverlist( &params ); +} + +static NTSTATUS wow64_resolv_query( void *args ) +{ + struct + { + PTR32 name; + WORD type; + DWORD options; + PTR32 buf; + PTR32 len; + } const *params32 = args; + + struct query_params params = + { + ULongToPtr(params32->name), + params32->type, + params32->options, + ULongToPtr(params32->buf), + ULongToPtr(params32->len) + }; + + return resolv_query( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_resolv_get_searchlist, + wow64_resolv_get_serverlist, + resolv_set_serverlist, + wow64_resolv_query, +}; + +#endif /* _WIN64 */ + #endif /* HAVE_RESOLV */ diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 7bfaf78cc7f..f732c6a6c65 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -170,7 +170,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned char answer[4096]; DWORD len = sizeof(answer); - struct set_serverlist_params servlist_params = { servers }; struct query_params query_params = { name, type, options, answer, &len }; TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), @@ -179,7 +178,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser if (!name || !result) return ERROR_INVALID_PARAMETER; - if ((ret = RESOLV_CALL( set_serverlist, &servlist_params ))) return ret; + if ((ret = RESOLV_CALL( set_serverlist, servers ))) return ret; ret = RESOLV_CALL( query, &query_params ); if (!ret)

1 0

Alexandre Julliard : gphoto2.ds: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 8a4b818a2dbfc1c732d428c703e046fcd33e14f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a4b818a2dbfc1c732d428c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:25 2021 +0100 gphoto2.ds: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/ds_image.c | 6 +- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/gphoto2.ds/gphoto2_main.c | 14 ++-- dlls/gphoto2.ds/unixlib.c | 141 +++++++++++++++++++++++++++++++++++------ dlls/gphoto2.ds/unixlib.h | 17 +---- 5 files changed, 133 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a4b818a2dbfc1c732d4…

1 0

Alexandre Julliard : netapi32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 7693fb80912ad53128200515e236b71398a8e61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7693fb80912ad53128200515… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:32 2021 +0100 netapi32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 4e77808cb86..8d61774b7d7 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -146,7 +146,7 @@ static NET_API_STATUS server_info_from_samba( DWORD level, const unsigned char * static NTSTATUS server_getinfo( void *args ) { - struct server_getinfo_params *params = args; + const struct server_getinfo_params *params = args; NET_API_STATUS status; char *samba_server = NULL; unsigned char *samba_buffer = NULL; @@ -707,7 +707,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne static NTSTATUS share_add( void *args ) { - struct share_add_params *params = args; + const struct share_add_params *params = args; char *samba_server = NULL; unsigned char *samba_info; NET_API_STATUS status; @@ -730,7 +730,7 @@ static NTSTATUS share_add( void *args ) static NTSTATUS share_del( void *args ) { - struct share_del_params *params = args; + const struct share_del_params *params = args; char *samba_server = NULL, *samba_share; NET_API_STATUS status; @@ -807,7 +807,7 @@ static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *b static NTSTATUS wksta_getinfo( void *args ) { - struct wksta_getinfo_params *params = args; + const struct wksta_getinfo_params *params = args; unsigned char *samba_buffer = NULL; char *samba_server = NULL; NET_API_STATUS status; @@ -888,7 +888,7 @@ static NTSTATUS netapi_init( void *args ) static NTSTATUS change_password( void *args ) { - struct change_password_params *params = args; + const struct change_password_params *params = args; NET_API_STATUS ret = NERR_Success; static char option_silent[] = "-s"; static char option_user[] = "-U"; @@ -986,4 +986,123 @@ const unixlib_entry_t __wine_unix_call_funcs[] = change_password, }; +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_server_getinfo( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 buffer; + PTR32 size; + } const *params32 = args; + + struct server_getinfo_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->buffer), + ULongToPtr(params32->size) + }; + + return server_getinfo( &params ); +} + +static NTSTATUS wow64_share_add( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 info; + PTR32 err; + } const *params32 = args; + + struct share_add_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->info), + ULongToPtr(params32->err) + }; + + return share_add( &params ); +} + +static NTSTATUS wow64_share_del( void *args ) +{ + struct + { + PTR32 server; + PTR32 share; + DWORD reserved; + } const *params32 = args; + + struct share_del_params params = + { + ULongToPtr(params32->server), + ULongToPtr(params32->share), + params32->reserved + }; + + return share_del( &params ); +} + +static NTSTATUS wow64_wksta_getinfo( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 buffer; + PTR32 size; + } const *params32 = args; + + struct wksta_getinfo_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->buffer), + ULongToPtr(params32->size) + }; + + return wksta_getinfo( &params ); +} + +static NTSTATUS wow64_change_password( void *args ) +{ + struct + { + PTR32 domain; + PTR32 user; + PTR32 old; + PTR32 new; + } const *params32 = args; + + struct change_password_params params = + { + ULongToPtr(params32->domain), + ULongToPtr(params32->user), + ULongToPtr(params32->old), + ULongToPtr(params32->new) + }; + + return change_password( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + netapi_init, + wow64_server_getinfo, + wow64_share_add, + wow64_share_del, + wow64_wksta_getinfo, + wow64_change_password, +}; + +#endif /* _WIN64 */ + #endif /* SONAME_LIBNETAPI */

1 0

Alexandre Julliard : sane.ds: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 7ec312902b461835839f309c84f95fbad760eb5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec312902b461835839f309c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:47 2021 +0100 sane.ds: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/sane_main.c | 7 +-- dlls/sane.ds/unixlib.c | 114 +++++++++++++++++++++++++++++++++++++++++++---- dlls/sane.ds/unixlib.h | 10 ----- 3 files changed, 107 insertions(+), 24 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index c67ad8e5f8b..48972bd4b8c 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -57,8 +57,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { - struct open_ds_params params = { self }; - if (SANE_dsmentry == NULL) { HMODULE moddsm = GetModuleHandleW(L"twain_32"); @@ -73,7 +71,7 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) } } - if (SANE_CALL( open_ds, &params )) return TWRC_FAILURE; + if (SANE_CALL( open_ds, self )) return TWRC_FAILURE; activeDS.twCC = SANE_SaneSetDefaults(); if (activeDS.twCC == TWCC_SUCCESS) @@ -110,8 +108,7 @@ static TW_UINT16 SANE_SourceControlHandler ( break; case MSG_GET: { - struct get_identity_params params = { pData }; - if (SANE_CALL( get_identity, &params )) + if (SANE_CALL( get_identity, pData )) { activeDS.twCC = TWCC_CAPUNSUPPORTED; twRC = TWRC_FAILURE; diff --git a/dlls/sane.ds/unixlib.c b/dlls/sane.ds/unixlib.c index f31ad094d56..897aa09e5ef 100644 --- a/dlls/sane.ds/unixlib.c +++ b/dlls/sane.ds/unixlib.c @@ -208,8 +208,7 @@ static NTSTATUS process_detach( void *args ) static NTSTATUS get_identity( void *args ) { - struct get_identity_params *params = args; - TW_IDENTITY *id = params->id; + TW_IDENTITY *id = args; static int cur_dev; detect_sane_devices(); @@ -232,8 +231,7 @@ static NTSTATUS get_identity( void *args ) static NTSTATUS open_ds( void *args ) { - struct open_ds_params *params = args; - TW_IDENTITY *id = params->id; + TW_IDENTITY *id = args; SANE_Status status; int i; @@ -303,7 +301,7 @@ static NTSTATUS cancel_device( void *args ) static NTSTATUS read_data( void *args ) { - struct read_data_params *params = args; + const struct read_data_params *params = args; unsigned char *buffer = params->buffer; int read_len, remaining = params->len; SANE_Status status; @@ -351,14 +349,14 @@ static NTSTATUS get_params( void *args ) static NTSTATUS option_get_value( void *args ) { - struct option_get_value_params *params = args; + const struct option_get_value_params *params = args; return sane_status_to_twcc( sane_control_option( device_handle, params->optno, SANE_ACTION_GET_VALUE, params->val, NULL )); } static NTSTATUS option_set_value( void *args ) { - struct option_set_value_params *params = args; + const struct option_set_value_params *params = args; int status = 0; TW_UINT16 rc = sane_status_to_twcc( sane_control_option( device_handle, params->optno, SANE_ACTION_SET_VALUE, params->val, &status )); @@ -379,7 +377,7 @@ static NTSTATUS option_get_descriptor( void *args ) static NTSTATUS option_find_descriptor( void *args ) { - struct option_find_descriptor_params *params = args; + const struct option_find_descriptor_params *params = args; struct option_descriptor *descr = params->descr; const SANE_Option_Descriptor *opt; int i; @@ -395,7 +393,7 @@ static NTSTATUS option_find_descriptor( void *args ) return STATUS_NO_MORE_ENTRIES; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { process_attach, process_detach, @@ -411,3 +409,101 @@ unixlib_entry_t __wine_unix_call_funcs[] = option_get_descriptor, option_find_descriptor, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_read_data( void *args ) +{ + struct + { + PTR32 buffer; + int len; + PTR32 retlen; + } const *params32 = args; + + struct read_data_params params = + { + ULongToPtr(params32->buffer), + params32->len, + ULongToPtr(params32->retlen) + }; + + return read_data( &params ); +} + +static NTSTATUS wow64_option_get_value( void *args ) +{ + struct + { + int optno; + PTR32 val; + } const *params32 = args; + + struct option_get_value_params params = + { + params32->optno, + ULongToPtr(params32->val) + }; + + return option_get_value( &params ); +} + +static NTSTATUS wow64_option_set_value( void *args ) +{ + struct + { + int optno; + PTR32 val; + PTR32 reload; + } const *params32 = args; + + struct option_set_value_params params = + { + params32->optno, + ULongToPtr(params32->val), + ULongToPtr(params32->reload) + }; + + return option_set_value( &params ); +} + + +static NTSTATUS wow64_option_find_descriptor( void *args ) +{ + struct + { + PTR32 name; + int type; + PTR32 descr; + } const *params32 = args; + + struct option_find_descriptor_params params = + { + ULongToPtr(params32->name), + params32->type, + ULongToPtr(params32->descr) + }; + + return option_find_descriptor( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + process_detach, + get_identity, + open_ds, + close_ds, + start_device, + cancel_device, + wow64_read_data, + get_params, + wow64_option_get_value, + wow64_option_set_value, + option_get_descriptor, + wow64_option_find_descriptor, +}; + +#endif /* _WIN64 */ diff --git a/dlls/sane.ds/unixlib.h b/dlls/sane.ds/unixlib.h index d07812fb175..6e38936ae90 100644 --- a/dlls/sane.ds/unixlib.h +++ b/dlls/sane.ds/unixlib.h @@ -53,16 +53,6 @@ struct option_descriptor } constraint; }; -struct get_identity_params -{ - TW_IDENTITY *id; -}; - -struct open_ds_params -{ - TW_IDENTITY *id; -}; - struct read_data_params { void *buffer;

1 0

Eric Pouech : winedump: Fix computation of signed integers in codeview symbol's annotations.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 27b7a96d9b0b4a30345ce82171439f3c5fe6cd59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b7a96d9b0b4a30345ce821… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:18 2021 +0100 winedump: Fix computation of signed integers in codeview symbol's annotations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 79dd022a088..40daf4d50d5 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1221,6 +1221,11 @@ static unsigned binannot_uncompress(const unsigned char** pptr) return res; } +static inline int binannot_getsigned(unsigned i) +{ + return (i & 1) ? -(int)(i >> 1) : (i >> 1); +} + static void dump_binannot(const unsigned char* ba, const char* last, const char* pfx) { while (ba < (const unsigned char*)last) @@ -1248,7 +1253,7 @@ static void dump_binannot(const unsigned char* ba, const char* last, const char* printf("%sChangeFile %u\n", pfx, binannot_uncompress(&ba)); break; case BA_OP_ChangeLineOffset: - printf("%sChangeLineOffset %d\n", pfx, binannot_uncompress(&ba)); + printf("%sChangeLineOffset %d\n", pfx, binannot_getsigned(binannot_uncompress(&ba))); break; case BA_OP_ChangeLineEndDelta: printf("%sChangeLineEndDelta %u\n", pfx, binannot_uncompress(&ba)); @@ -1265,7 +1270,7 @@ static void dump_binannot(const unsigned char* ba, const char* last, const char* case BA_OP_ChangeCodeOffsetAndLineOffset: { unsigned p1 = binannot_uncompress(&ba); - printf("%sChangeCodeOffsetAndLineOffset %u %u (0x%x)\n", pfx, p1 & 0xf, p1 >> 4, p1); + printf("%sChangeCodeOffsetAndLineOffset %u %u (0x%x)\n", pfx, p1 & 0xf, binannot_getsigned(p1 >> 4), p1); } break; case BA_OP_ChangeCodeLengthAndCodeOffset:

1 0

Eric Pouech : dbghelp: Check that we don't add same line number twice.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: e105e9d35ee9f28f5a1615cd8f2b582ae8d82041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e105e9d35ee9f28f5a1615cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:32 2021 +0100 dbghelp: Check that we don't add same line number twice. This happens (at least) in dwarf debug info where there could be two entries with same source file and line number, but different column numbers (and we don't store columns). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 7747aaae2ae..435d94bc8eb 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -418,6 +418,11 @@ void symt_add_func_line(struct module* module, struct symt_function* func, } vlen = vector_length(&func->vlines); prev = vlen ? vector_at(&func->vlines, vlen - 1) : NULL; + if (last_matches && prev && addr == prev->u.address) + { + WARN("Duplicate addition of line number in %s\n", func->hash_elt.name); + return; + } if (!last_matches) { /* we shouldn't have line changes on first line of function */

1 0

Eric Pouech : dbghelp: Attach a struct cpu* to every module.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: d72e6ac772ed7ae5160328992620944a38a145da URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72e6ac772ed7ae516032899… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:46 2021 +0100 dbghelp: Attach a struct cpu* to every module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/module.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 61173b34b5a..1e77ed49225 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -430,6 +430,8 @@ struct module_format } u; }; +struct cpu; + struct module { struct process* process; @@ -438,6 +440,7 @@ struct module struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; + struct cpu* cpu; DWORD64 reloc_delta; WCHAR* real_path; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8168e727c52..65bdbb38fda 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -230,6 +230,9 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->addr_sorttab = NULL; module->num_sorttab = 0; module->num_symbols = 0; + module->cpu = cpu_find(machine); + if (!module->cpu) + module->cpu = dbghelp_current_cpu; vector_init(&module->vsymt, sizeof(struct symt*), 128); vector_init(&module->vcustom_symt, sizeof(struct symt*), 16);

1 0