November 2021 - Wine-Commits

Alexandre Julliard : mountmgr: Move the DiskArbitration support to the Unix library.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 236a1bc8f0c8a01e9312748eca149ec5e773397d URL: https://source.winehq.org/git/wine.git/?a=commit;h=236a1bc8f0c8a01e9312748e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 16:50:41 2021 +0100 mountmgr: Move the DiskArbitration support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 5 --- dlls/mountmgr.sys/diskarb.c | 72 ++++++++++++++++++++------------------------ dlls/mountmgr.sys/mountmgr.c | 6 ---- dlls/mountmgr.sys/mountmgr.h | 6 ---- dlls/mountmgr.sys/unixlib.c | 1 + dlls/mountmgr.sys/unixlib.h | 1 + 6 files changed, 34 insertions(+), 57 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 43f79d39034..28b229f03d0 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -827,9 +827,4 @@ void run_dbus_loop(void) TRACE( "Skipping, DBUS support not compiled in\n" ); } -NTSTATUS dhcp_request( void *args ) -{ - return STATUS_NOT_SUPPORTED; -} - #endif /* SONAME_LIBDBUS_1 */ diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 7c55659862d..e034a4c1c5b 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -18,8 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> @@ -43,6 +46,8 @@ #include "winsock2.h" #include "ws2ipdef.h" #include "dhcpcsdk.h" +#include "unixlib.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); @@ -163,9 +168,9 @@ static void appeared_callback( DADiskRef disk, void *context ) } if (removable) - add_dos_device( -1, device, device, mount_point, type, guid_ptr, &scsi_info ); + queue_device_op( ADD_DOS_DEVICE, device, device, mount_point, type, guid_ptr, NULL, &scsi_info ); else - if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL, &scsi_info ); + if (guid_ptr) queue_device_op( ADD_VOLUME, device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL, &scsi_info ); done: CFRelease( dict ); @@ -191,20 +196,17 @@ static void disappeared_callback( DADiskRef disk, void *context ) TRACE( "got unmount notification for '%s'\n", device ); - if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) - remove_dos_device( -1, device ); - else - remove_volume( device ); + queue_device_op( REMOVE_DEVICE, device, NULL, NULL, 0, NULL, NULL, NULL ); done: CFRelease( dict ); } -static DWORD WINAPI runloop_thread( void *arg ) +void run_diskarbitration_loop(void) { DASessionRef session = DASessionCreate( NULL ); - if (!session) return 1; + if (!session) return; DASessionScheduleWithRunLoop( session, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode ); DARegisterDiskAppearedCallback( session, kDADiskDescriptionMatchVolumeMountable, @@ -216,20 +218,11 @@ static DWORD WINAPI runloop_thread( void *arg ) CFRunLoopRun(); DASessionUnscheduleFromRunLoop( session, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode ); CFRelease( session ); - return 0; -} - -void initialize_diskarbitration(void) -{ - HANDLE handle; - - if (!(handle = CreateThread( NULL, 0, runloop_thread, NULL, 0, NULL ))) return; - CloseHandle( handle ); } #else /* HAVE_DISKARBITRATION_DISKARBITRATION_H */ -void initialize_diskarbitration(void) +void run_diskarbitration_loop(void) { TRACE( "Skipping, Disk Arbitration support not compiled in\n" ); } @@ -291,17 +284,17 @@ done: return ret; } -ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, - ULONG size ) +NTSTATUS dhcp_request( void *args ) { - CFStringRef service_id = find_service_id( unix_name ); + const struct dhcp_request_params *params = args; + CFStringRef service_id = find_service_id( params->unix_name ); CFDictionaryRef dict; CFDataRef value; DWORD ret = 0; CFIndex len; - param->offset = 0; - param->size = 0; + params->req->offset = 0; + params->req->size = 0; if (!service_id) return 0; if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id ))) @@ -310,25 +303,25 @@ ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_reques return 0; } CFRelease( service_id ); - if (!(value = DHCPInfoGetOptionData( dict, map_option(param->id) ))) + if (!(value = DHCPInfoGetOptionData( dict, map_option(params->req->id) ))) { CFRelease( dict ); return 0; } len = CFDataGetLength( value ); - switch (param->id) + switch (params->req->id) { case OPTION_SUBNET_MASK: case OPTION_ROUTER_ADDRESS: case OPTION_BROADCAST_ADDRESS: { - DWORD *ptr = (DWORD *)(buf + offset); - if (len == sizeof(*ptr) && size >= sizeof(*ptr)) + DWORD *ptr = (DWORD *)(params->buffer + params->offset); + if (len == sizeof(*ptr) && params->size >= sizeof(*ptr)) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); - param->offset = offset; - param->size = sizeof(*ptr); + params->req->offset = params->offset; + params->req->size = sizeof(*ptr); TRACE( "returning %08x\n", *ptr ); } ret = sizeof(*ptr); @@ -338,33 +331,32 @@ ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_reques case OPTION_DOMAIN_NAME: case OPTION_MSFT_IE_PROXY: { - char *ptr = buf + offset; - if (size >= len) + char *ptr = params->buffer + params->offset; + if (params->size >= len) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); - param->offset = offset; - param->size = len; + params->req->offset = params->offset; + params->req->size = len; TRACE( "returning %s\n", debugstr_an(ptr, len) ); } ret = len; break; } default: - FIXME( "option %u not supported\n", param->id ); + FIXME( "option %u not supported\n", params->req->id ); break; } CFRelease( dict ); - return ret; + *params->ret_size = ret; + return STATUS_SUCCESS; } #elif !defined(SONAME_LIBDBUS_1) -ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, - ULONG size ) +NTSTATUS dhcp_request( void *args ) { - FIXME( "support not compiled in\n" ); - return 0; + return STATUS_NOT_SUPPORTED; } #endif diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 8aeaee8dc04..2e3ff80c36a 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -408,15 +408,11 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo offset = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]); for (i = 0; i < query->count; i++) { -#ifdef __APPLE__ - offset += get_dhcp_request_param( query->unix_name, &query->params[i], (char *)query, offset, outsize - offset ); -#else ULONG ret_size; struct dhcp_request_params params = { query->unix_name, &query->params[i], (char *)query, offset, outsize - offset, &ret_size }; MOUNTMGR_CALL( dhcp_request, &params ); offset += ret_size; -#endif if (offset > outsize) { if (offset >= sizeof(query->size)) query->size = offset; @@ -685,8 +681,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) params.op_apc = device_op; CloseHandle( CreateThread( NULL, 0, run_loop_thread, &params, 0, NULL )); - initialize_diskarbitration(); - #ifdef _WIN64 /* create a symlink so that the Wine port overrides key can be edited with 32-bit reg or regedit */ RegCreateKeyExW( HKEY_LOCAL_MACHINE, wow64_ports_keyW, 0, NULL, REG_OPTION_CREATE_LINK, diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index c3557d7e548..0297f6f11fe 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -36,8 +36,6 @@ #define WINE_MOUNTMGR_EXTENSIONS #include "ddk/mountmgr.h" -extern void initialize_diskarbitration(void) DECLSPEC_HIDDEN; - extern WCHAR *strdupW( const WCHAR * ) DECLSPEC_HIDDEN; /* device functions */ @@ -114,8 +112,4 @@ extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICOD extern void delete_mount_point( struct mount_point *mount ) DECLSPEC_HIDDEN; extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN; -#ifdef __APPLE__ -extern ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_request_param *param, - char *buf, ULONG offset, ULONG size ) DECLSPEC_HIDDEN; -#endif #endif /* __WINE_MOUNTMGR_H */ diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index caecb0140a8..54ba8c81b78 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -128,6 +128,7 @@ static NTSTATUS run_loop( void *args ) const struct run_loop_params *params = args; run_loop_params = *params; + run_diskarbitration_loop(); run_dbus_loop(); return STATUS_SUCCESS; } diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index afaed5fa559..74d076fa4fd 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -152,6 +152,7 @@ extern void queue_device_op( enum device_op op, const char *udi, const char *dev const char *mount_point, enum device_type type, const GUID *guid, const char *disk_serial, const struct scsi_info *info ) DECLSPEC_HIDDEN; extern void run_dbus_loop(void) DECLSPEC_HIDDEN; +extern void run_diskarbitration_loop(void) DECLSPEC_HIDDEN; extern NTSTATUS dhcp_request( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info ) DECLSPEC_HIDDEN;

1 0

Huw Davies : winecoreaudio: Move midi_out_prepare and midi_out_unprepare to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 15e30a492e4e51587e4e908dd6b8680221410188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e30a492e4e51587e4e908d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:43 2021 +0000 winecoreaudio: Move midi_out_prepare and midi_out_unprepare to the unixlib. While these could be left on the user-side, it seems simplest to move everything across. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 36 +++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 40 --------------------------------------- 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index d80b8c1711b..3a560c21d74 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -565,6 +565,36 @@ static DWORD midi_out_long_data(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size, struc return MMSYSERR_NOERROR; } +static DWORD midi_out_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +{ + TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static DWORD midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +{ + TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -591,6 +621,12 @@ NTSTATUS midi_out_message(void *args) case MODM_LONGDATA: *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); break; + case MODM_PREPARE: + *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MODM_UNPREPARE: + *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 589a08e0907..71bd7afebdf 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -155,42 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -/************************************************************************** - * MIDIOut_Prepare [internal] - */ -static DWORD MIDIOut_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * MIDIOut_Unprepare [internal] - */ -static DWORD MIDIOut_Unprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - static DWORD MIDIOut_GetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) { TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); @@ -642,10 +606,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_PREPARE: - return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: - return MIDIOut_Unprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return MIDIOut_GetDevCaps(wDevID, (LPMIDIOUTCAPSW) dwParam1, dwParam2); case MODM_GETNUMDEVS:

1 0

Eric Pouech : winedbg: Protect against incorrect integer size in be_cpu.fetch_integer() method.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 0ed49fabc3cae185a610ee973d4b0c75877812d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed49fabc3cae185a610ee97… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:52 2021 +0100 winedbg: Protect against incorrect integer size in be_cpu.fetch_integer() method. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 3 ++- programs/winedbg/be_arm64.c | 3 ++- programs/winedbg/be_i386.c | 3 ++- programs/winedbg/be_x86_64.c | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index fa25ce8dd2b..3bf5771439c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1834,7 +1834,8 @@ static int be_arm_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index 9ceb9291d54..d7611ba75de 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -231,7 +231,8 @@ static int be_arm64_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_arm64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 08d0841a208..e7a1dd9d460 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -780,7 +780,8 @@ static int be_i386_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index c2839cf4097..4920bf2d0ca 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -702,8 +702,8 @@ static int be_x86_64_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) - return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same

1 0

Eric Pouech : winedbg: Get size of underlying integral types in enums.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 16fb9640d72be2bbd1b1764434798a5315d4fbcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=16fb9640d72be2bbd1b17644… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:40 2021 +0100 winedbg: Get size of underlying integral types in enums. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 10 +++++----- programs/winedbg/types.c | 4 ++-- programs/winedbg/winedbg.c | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 9000d0126c7..b736d06a67e 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -439,11 +439,8 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) { BOOL ok = FALSE; - /* FIXME: it depends on underlying type for enums - * (not supported yet in dbghelp) - * Assuming 4 as for an int - */ - if (!dbg_curr_process->be_cpu->fetch_integer(lvalue, 4, TRUE, &val_int)) return; + if (!types_get_info(&type, TI_GET_LENGTH, &size64) || + !dbg_curr_process->be_cpu->fetch_integer(lvalue, size64, TRUE, &val_int)) return; if (types_get_info(&type, TI_GET_CHILDRENCOUNT, &count)) { @@ -468,7 +465,10 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) continue; switch (V_VT(&variant)) { + case VT_I1: ok = (val_int == V_I1(&variant)); break; + case VT_I2: ok = (val_int == V_I2(&variant)); break; case VT_I4: ok = (val_int == V_I4(&variant)); break; + case VT_I8: ok = (val_int == V_I8(&variant)); break; default: WINE_FIXME("Unsupported variant type (%u)\n", V_VT(&variant)); } if (ok) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 9d98a136428..354c97e5d70 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -114,8 +114,8 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagEnum: - /* FIXME: we don't handle enum size */ - if (!dbg_curr_process->be_cpu->fetch_integer(lvalue, sizeof(unsigned), s = FALSE, &rtn)) + if (!types_get_info(&type, TI_GET_LENGTH, &size) || + !dbg_curr_process->be_cpu->fetch_integer(lvalue, (unsigned)size, s = FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagFunctionType: diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 45a7edfb309..0d4a38b2d83 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -44,7 +44,6 @@ * - type management: * + some bits of internal types are missing (like type casts and the address * operator) - * + the type for an enum's value is always inferred as int (winedbg & dbghelp) * + most of the code implies that sizeof(void*) = sizeof(int) * + all computations should be made on long long * o expr computations are in int:s

1 0

Eric Pouech : winedbg: Use macros when manipulating variants.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 5b54dac338c85562941e67462913fddcf613bc9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b54dac338c85562941e6746… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:34 2021 +0100 winedbg: Use macros when manipulating variants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 6 +++--- programs/winedbg/symbol.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 4128606c9a9..9000d0126c7 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -466,10 +466,10 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) sub_type.id = fcp->ChildId[i]; if (!types_get_info(&sub_type, TI_GET_VALUE, &variant)) continue; - switch (variant.n1.n2.vt) + switch (V_VT(&variant)) { - case VT_I4: ok = (val_int == variant.n1.n2.n3.lVal); break; - default: WINE_FIXME("Unsupported variant type (%u)\n", variant.n1.n2.vt); + case VT_I4: ok = (val_int == V_I4(&variant)); break; + default: WINE_FIXME("Unsupported variant type (%u)\n", V_VT(&variant)); } if (ok) { diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 856cc86c8f4..a3b9cb38995 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -105,7 +105,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, if (buffer) snprintf(buffer, sz, "Couldn't get full value information for %s", sym->Name); return FALSE; } - else if (v.n1.n2.vt & VT_BYREF) + else if (V_ISBYREF(&v)) { /* FIXME: this won't work for pointers or arrays, as we don't always * know, if the value to be dereferenced lies in debuggee or

1 0

Huw Davies : winecoreaudio: Move midi_out_get_devcaps to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 266efe5c5dc21d0943e4bdb73181feaaf35359c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=266efe5c5dc21d0943e4bdb7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:44 2021 +0000 winecoreaudio: Move midi_out_get_devcaps to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 22 ++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 19 ------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 3a560c21d74..dd217ea95f3 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -595,6 +595,25 @@ static DWORD midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; } +static DWORD midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, DWORD size) +{ + TRACE("dev_id = %d caps = %p size = %d\n", dev_id, caps, size); + + if (!caps) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + memcpy(caps, &dests[dev_id].caps, min(size, sizeof(*caps))); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -627,6 +646,9 @@ NTSTATUS midi_out_message(void *args) case MODM_UNPREPARE: *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MODM_GETDEVCAPS: + *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 71bd7afebdf..675950f45d1 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -155,23 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_GetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) -{ - TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); - - if (lpCaps == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - memcpy(lpCaps, &destinations[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - return MMSYSERR_NOERROR; -} - static DWORD MIDIOut_GetNumDevs(void) { TRACE("\n"); @@ -606,8 +589,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_GETDEVCAPS: - return MIDIOut_GetDevCaps(wDevID, (LPMIDIOUTCAPSW) dwParam1, dwParam2); case MODM_GETNUMDEVS: return MIDIOut_GetNumDevs(); case MODM_GETVOLUME:

1 0

Huw Davies : winecoreaudio: Move midi_out_get_num_devs to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 501cbc19442c9d525085155aa8e28c1c5ffd0e90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=501cbc19442c9d525085155a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:45 2021 +0000 winecoreaudio: Move midi_out_get_num_devs to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 9 +++++++++ dlls/winecoreaudio.drv/midi.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index dd217ea95f3..769491f2414 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -614,6 +614,12 @@ static DWORD midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, DWORD size) return MMSYSERR_NOERROR; } +static DWORD midi_out_get_num_devs(void) +{ + TRACE("\n"); + return num_dests; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -649,6 +655,9 @@ NTSTATUS midi_out_message(void *args) case MODM_GETDEVCAPS: *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); break; + case MODM_GETNUMDEVS: + *params->err = midi_out_get_num_devs(); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 675950f45d1..7f5496fe715 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -155,12 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_GetNumDevs(void) -{ - TRACE("\n"); - return MIDIOut_NumDevs; -} - static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume) { TRACE("%d\n", wDevID); @@ -589,8 +583,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_GETNUMDEVS: - return MIDIOut_GetNumDevs(); case MODM_GETVOLUME: return MIDIOut_GetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME:

1 0

Eric Pouech : winedbg: Use debuggee pointer size when extracting typed value.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: c8006d07eb3211981411cc98c79428b31bc7b506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8006d07eb3211981411cc98… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:46 2021 +0100 winedbg: Use debuggee pointer size when extracting typed value. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 3 ++- programs/winedbg/winedbg.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 354c97e5d70..5e9188ccc6e 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -105,7 +105,8 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, if (issigned) *issigned = s; break; case SymTagPointerType: - if (!dbg_curr_process->be_cpu->fetch_integer(lvalue, sizeof(void*), s = FALSE, &rtn)) + if (!types_get_info(&type, TI_GET_LENGTH, &size) || + !dbg_curr_process->be_cpu->fetch_integer(lvalue, (unsigned)size, s = FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagArrayType: diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 0d4a38b2d83..55801536a79 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -44,7 +44,6 @@ * - type management: * + some bits of internal types are missing (like type casts and the address * operator) - * + most of the code implies that sizeof(void*) = sizeof(int) * + all computations should be made on long long * o expr computations are in int:s * o bitfield size is on a 4-bytes

1 0

Eric Pouech : winedbg: Print 'module+disp' instead of 'func+disp' when the address is after the function.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: a29a8a317ae9a82d5d360d3b52a491150d50da9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29a8a317ae9a82d5d360d3b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:22 2021 +0100 winedbg: Print 'module+disp' instead of 'func+disp' when the address is after the function. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 2490b7cf7e2..4128606c9a9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -583,28 +583,42 @@ void print_address(const ADDRESS64* addr, BOOLEAN with_line) { char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* si = (SYMBOL_INFO*)buffer; - void* lin = memory_to_linear_addr(addr); + DWORD_PTR lin = (DWORD_PTR)memory_to_linear_addr(addr); DWORD64 disp64; DWORD disp; + IMAGEHLP_MODULE im; print_bare_address(addr); si->SizeOfStruct = sizeof(*si); si->MaxNameLen = 256; - if (!SymFromAddr(dbg_curr_process->handle, (DWORD_PTR)lin, &disp64, si)) return; - dbg_printf(" %s", si->Name); - if (disp64) dbg_printf("+0x%I64x", disp64); + im.SizeOfStruct = 0; + if (SymFromAddr(dbg_curr_process->handle, lin, &disp64, si) && disp64 < si->Size) + { + dbg_printf(" %s", si->Name); + if (disp64) dbg_printf("+0x%I64x", disp64); + } + else + { + im.SizeOfStruct = sizeof(im); + if (!SymGetModuleInfo(dbg_curr_process->handle, lin, &im)) return; + dbg_printf(" %s", im.ModuleName); + if (lin > im.BaseOfImage) + dbg_printf("+0x%Ix", lin - im.BaseOfImage); + } if (with_line) { IMAGEHLP_LINE64 il; - IMAGEHLP_MODULE im; il.SizeOfStruct = sizeof(il); - if (SymGetLineFromAddr64(dbg_curr_process->handle, (DWORD_PTR)lin, &disp, &il)) + if (SymGetLineFromAddr64(dbg_curr_process->handle, lin, &disp, &il)) dbg_printf(" [%s:%u]", il.FileName, il.LineNumber); - im.SizeOfStruct = sizeof(im); - if (SymGetModuleInfo(dbg_curr_process->handle, (DWORD_PTR)lin, &im)) - dbg_printf(" in %s", im.ModuleName); + if (im.SizeOfStruct == 0) /* don't display again module if address is in module+disp form */ + { + im.SizeOfStruct = sizeof(im); + if (SymGetModuleInfo(dbg_curr_process->handle, lin, &im)) + dbg_printf(" in %s", im.ModuleName); + } } }

1 0

Gabriel Ivăncescu : nsiproxy: Move set_reply_ip_status to a family op.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 5e8bd4d38e4a2e45f9f043695e7563461bcf0ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8bd4d38e4a2e45f9f04369… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 8 18:18:02 2021 +0200 nsiproxy: Move set_reply_ip_status to a family op. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/icmp_echo.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 955fdfdb979..a4ef02a4a10 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -210,6 +210,14 @@ static unsigned short null_chksum( BYTE *data, unsigned int count ) } #endif +static int ipv4_set_reply_ip_status( IP_STATUS ip_status, void *out ) +{ + struct nsiproxy_icmp_echo_reply *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = ip_status; + return sizeof(*reply); +} + static void ipv4_set_socket_opts( struct icmp_data *data, struct icmp_send_echo_params *params ) { int val; @@ -393,6 +401,7 @@ struct family_ops int icmp_protocol; void (*init_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp_hdr ); unsigned short (*chksum)( BYTE *data, unsigned int count ); + int (*set_reply_ip_status)( IP_STATUS ip_status, void *out ); void (*set_socket_opts)( struct icmp_data *data, struct icmp_send_echo_params *params ); int (*reply_buffer_len)( int reply_len ); BOOL (*parse_ip_hdr)( struct msghdr *msg, int recvd, @@ -407,6 +416,7 @@ static const struct family_ops ipv4 = IPPROTO_ICMP, ipv4_init_icmp_hdr, chksum, + ipv4_set_reply_ip_status, ipv4_set_socket_opts, ipv4_reply_buffer_len, ipv4_parse_ip_hdr, @@ -421,6 +431,7 @@ static const struct family_ops ipv4_linux_ping = IPPROTO_ICMP, ipv4_init_icmp_hdr, null_chksum, + ipv4_set_reply_ip_status, ipv4_linux_ping_set_socket_opts, ipv4_linux_ping_reply_buffer_len, ipv4_linux_ping_parse_ip_hdr, @@ -584,16 +595,6 @@ NTSTATUS icmp_send_echo( void *args ) return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; } -static NTSTATUS set_reply_ip_status( struct icmp_listen_params *params, IP_STATUS ip_status ) -{ - struct nsiproxy_icmp_echo_reply *reply = params->reply; - - memset( reply, 0, sizeof(*reply) ); - reply->status = ip_status; - params->reply_len = sizeof(*reply); - return STATUS_SUCCESS; -} - static int get_timeout( LARGE_INTEGER start, DWORD timeout ) { LARGE_INTEGER now, end; @@ -647,7 +648,8 @@ static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_listen_params *par if (reply->data_size && msg.msg_flags & MSG_TRUNC) { free( reply_buf ); - return set_reply_ip_status( params, IP_GENERAL_FAILURE ); + params->reply_len = data->ops->set_reply_ip_status( IP_GENERAL_FAILURE, params->reply ); + return STATUS_SUCCESS; } sockaddr_to_SOCKADDR_INET( (struct sockaddr *)&addr, &reply->addr ); @@ -703,10 +705,12 @@ NTSTATUS icmp_listen( void *args ) if (!ret) /* timeout */ { TRACE( "timeout\n" ); - return set_reply_ip_status( params, IP_REQ_TIMED_OUT ); + params->reply_len = data->ops->set_reply_ip_status( IP_REQ_TIMED_OUT, params->reply ); + return STATUS_SUCCESS; } /* ret < 0 */ - return set_reply_ip_status( params, errno_to_ip_status( errno ) ); + params->reply_len = data->ops->set_reply_ip_status( errno_to_ip_status( errno ), params->reply ); + return STATUS_SUCCESS; } NTSTATUS icmp_cancel_listen( void *args )

1 0