November 2023 - Wine-commits

Alexandre Julliard : mountmgr: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 24 Nov '23

24 Nov '23

Module: wine Branch: master Commit: 2c19fc3a3e33fe90ff13c09446bdc925fa13c873 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c19fc3a3e33fe90ff13c09446bdc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:33:15 2023 +0100 mountmgr: Remove DECLSPEC_HIDDEN usage. --- dlls/mountmgr.sys/mountmgr.h | 24 ++++++++++++------------ dlls/mountmgr.sys/unixlib.h | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 143401e3b9b..b1de312dffb 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -50,9 +50,9 @@ enum device_type DEVICE_RAMDISK }; -extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); +extern NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); +extern NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); enum scsi_device_type { @@ -90,24 +90,24 @@ struct scsi_info extern NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid, const char *disk_serial, - const struct scsi_info *info ) DECLSPEC_HIDDEN; -extern NTSTATUS remove_volume( const char *udi ) DECLSPEC_HIDDEN; + const struct scsi_info *info ); +extern NTSTATUS remove_volume( const char *udi ); extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid, - const struct scsi_info *info ) DECLSPEC_HIDDEN; -extern NTSTATUS remove_dos_device( int letter, const char *udi ) DECLSPEC_HIDDEN; + const struct scsi_info *info ); +extern NTSTATUS remove_dos_device( int letter, const char *udi ); extern NTSTATUS query_unix_drive( void *buff, SIZE_T insize, SIZE_T outsize, - IO_STATUS_BLOCK *iosb ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *iosb ); /* mount point functions */ struct mount_point; extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive ) DECLSPEC_HIDDEN; + int drive ); extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const GUID *guid ) DECLSPEC_HIDDEN; -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; + const GUID *guid ); +extern void delete_mount_point( struct mount_point *mount ); +extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ); #endif /* __WINE_MOUNTMGR_H */ diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index 93e812a516f..41f64251e22 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -179,13 +179,13 @@ enum mountmgr_funcs extern void queue_device_op( enum device_op op, const char *udi, const char *device, 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 *args ) DECLSPEC_HIDDEN; -extern NTSTATUS read_credential( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS write_credential( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS delete_credential( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS enumerate_credentials( void *args ) DECLSPEC_HIDDEN; + const char *disk_serial, const struct scsi_info *info ); +extern void run_dbus_loop(void); +extern void run_diskarbitration_loop(void); + +extern NTSTATUS dhcp_request( void *args ); +extern NTSTATUS query_symbol_file( void *args ); +extern NTSTATUS read_credential( void *args ); +extern NTSTATUS write_credential( void *args ); +extern NTSTATUS delete_credential( void *args ); +extern NTSTATUS enumerate_credentials( void *args );

1 0

Alexandre Julliard : nsiproxy.sys: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 24 Nov '23

24 Nov '23

Module: wine Branch: master Commit: 0c102b1a0b7bd33d4c8760c93bd3d0dbf7591391 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c102b1a0b7bd33d4c8760c93bd3d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:33:34 2023 +0100 nsiproxy.sys: Remove DECLSPEC_HIDDEN usage. --- dlls/nsiproxy.sys/unix_private.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 84fea0c42d2..907496a01c7 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -24,9 +24,9 @@ #define IPV4_ADDR(b1, b2, b3, b4) (((unsigned int)b4 << 24) | (b3 << 16) | (b2 << 8) | b1) #endif -NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; -NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; -NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ); +NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ); +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ); static inline NTSTATUS nsi_enumerate_all( UINT unk, UINT unk2, const NPI_MODULEID *module, UINT table, void *key_data, UINT key_size, void *rw_data, UINT rw_size, @@ -57,8 +57,8 @@ static inline NTSTATUS nsi_enumerate_all( UINT unk, UINT unk2, const NPI_MODULEI return status; } -BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) DECLSPEC_HIDDEN; -BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; +BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ); +BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ); static inline BOOL convert_luid_to_index( const NET_LUID *luid, UINT *index ) { @@ -104,8 +104,8 @@ struct ipv6_addr_scope UINT scope; }; -struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) DECLSPEC_HIDDEN; -UINT find_ipv6_addr_scope( const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size ) DECLSPEC_HIDDEN; +struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ); +UINT find_ipv6_addr_scope( const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size ); struct pid_map { @@ -113,8 +113,8 @@ struct pid_map unsigned int unix_pid; }; -struct pid_map *get_pid_map( unsigned int *num_entries ) DECLSPEC_HIDDEN; -unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UINT_PTR inode ) DECLSPEC_HIDDEN; +struct pid_map *get_pid_map( unsigned int *num_entries ); +unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UINT_PTR inode ); struct module_table { @@ -136,11 +136,11 @@ struct module const struct module_table *tables; }; -extern const struct module ndis_module DECLSPEC_HIDDEN; -extern const struct module ipv4_module DECLSPEC_HIDDEN; -extern const struct module ipv6_module DECLSPEC_HIDDEN; -extern const struct module tcp_module DECLSPEC_HIDDEN; -extern const struct module udp_module DECLSPEC_HIDDEN; +extern const struct module ndis_module; +extern const struct module ipv4_module; +extern const struct module ipv6_module; +extern const struct module tcp_module; +extern const struct module udp_module; static inline int ascii_strncasecmp( const char *s1, const char *s2, size_t n ) { @@ -163,7 +163,7 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) return ascii_strncasecmp( s1, s2, -1 ); } -NTSTATUS icmp_cancel_listen( void *args ) DECLSPEC_HIDDEN; -NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; -NTSTATUS icmp_listen( void *args ) DECLSPEC_HIDDEN; -NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; +NTSTATUS icmp_cancel_listen( void *args ); +NTSTATUS icmp_close( void *args ); +NTSTATUS icmp_listen( void *args ); +NTSTATUS icmp_send_echo( void *args );

1 0

Alexandre Julliard : winebus.sys: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 24 Nov '23

24 Nov '23

Module: wine Branch: master Commit: d1d15757a44c59122b0592957597deaad06169c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d15757a44c59122b0592957597de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:33:50 2023 +0100 winebus.sys: Remove DECLSPEC_HIDDEN usage. --- dlls/winebus.sys/unix_private.h | 76 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 3001c32e89e..1ec414cce73 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -217,57 +217,57 @@ struct unix_device struct hid_physical hid_physical; }; -extern void *raw_device_create(const struct raw_device_vtbl *vtbl, SIZE_T size) DECLSPEC_HIDDEN; -extern void *hid_device_create(const struct hid_device_vtbl *vtbl, SIZE_T size) DECLSPEC_HIDDEN; +extern void *raw_device_create(const struct raw_device_vtbl *vtbl, SIZE_T size); +extern void *hid_device_create(const struct hid_device_vtbl *vtbl, SIZE_T size); -extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_init(void *); +extern NTSTATUS sdl_bus_wait(void *); +extern NTSTATUS sdl_bus_stop(void *); -extern NTSTATUS udev_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS udev_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS udev_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS udev_bus_init(void *); +extern NTSTATUS udev_bus_wait(void *); +extern NTSTATUS udev_bus_stop(void *); -extern NTSTATUS iohid_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS iohid_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS iohid_bus_init(void *); +extern NTSTATUS iohid_bus_wait(void *); +extern NTSTATUS iohid_bus_stop(void *); -extern void bus_event_cleanup(struct bus_event *event) DECLSPEC_HIDDEN; -extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; -extern BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *device) DECLSPEC_HIDDEN; -extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) DECLSPEC_HIDDEN; +extern void bus_event_cleanup(struct bus_event *event); +extern void bus_event_queue_destroy(struct list *queue); +extern BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *device); +extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc); extern BOOL bus_event_queue_input_report(struct list *queue, struct unix_device *device, - BYTE *report, USHORT length) DECLSPEC_HIDDEN; -extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) DECLSPEC_HIDDEN; + BYTE *report, USHORT length); +extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event); -extern BOOL hid_device_begin_report_descriptor(struct unix_device *iface, const USAGE_AND_PAGE *device_usage) DECLSPEC_HIDDEN; -extern BOOL hid_device_end_report_descriptor(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_begin_report_descriptor(struct unix_device *iface, const USAGE_AND_PAGE *device_usage); +extern BOOL hid_device_end_report_descriptor(struct unix_device *iface); -extern BOOL hid_device_begin_input_report(struct unix_device *iface, const USAGE_AND_PAGE *physical_usage) DECLSPEC_HIDDEN; -extern BOOL hid_device_end_input_report(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_begin_input_report(struct unix_device *iface, const USAGE_AND_PAGE *physical_usage); +extern BOOL hid_device_end_input_report(struct unix_device *iface); extern BOOL hid_device_add_buttons(struct unix_device *iface, USAGE usage_page, - USAGE usage_min, USAGE usage_max) DECLSPEC_HIDDEN; -extern BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) DECLSPEC_HIDDEN; + USAGE usage_min, USAGE usage_max); +extern BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count); extern BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page, - const USAGE *usages, BOOL rel, LONG min, LONG max) DECLSPEC_HIDDEN; + const USAGE *usages, BOOL rel, LONG min, LONG max); -extern BOOL hid_device_add_haptics(struct unix_device *iface) DECLSPEC_HIDDEN; -extern BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) DECLSPEC_HIDDEN; +extern BOOL hid_device_add_haptics(struct unix_device *iface); +extern BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count); -extern BOOL hid_device_set_abs_axis(struct unix_device *iface, ULONG index, LONG value) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG value) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y) DECLSPEC_HIDDEN; -extern BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) DECLSPEC_HIDDEN; +extern BOOL hid_device_set_abs_axis(struct unix_device *iface, ULONG index, LONG value); +extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG value); +extern BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set); +extern BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x); +extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y); +extern BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y); -extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; -extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_sync_report(struct unix_device *iface); +extern void hid_device_drop_report(struct unix_device *iface); -extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags) DECLSPEC_HIDDEN; +extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags); -BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -BOOL is_dualshock4_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -BOOL is_dualsense_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; +BOOL is_xbox_gamepad(WORD vid, WORD pid); +BOOL is_dualshock4_gamepad(WORD vid, WORD pid); +BOOL is_dualsense_gamepad(WORD vid, WORD pid); #endif /* __WINEBUS_UNIX_PRIVATE_H */

1 0

Alexandre Julliard : ws2_32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 24 Nov '23

24 Nov '23

Module: wine Branch: master Commit: 741985693ddf92fe2988e3427f2fe74e83a306f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/741985693ddf92fe2988e3427f2fe7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:34:24 2023 +0100 ws2_32: Remove DECLSPEC_HIDDEN usage. --- dlls/ws2_32/ws2_32_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index a009a1eefd3..9e116de814d 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -73,7 +73,7 @@ static inline char *strdupWtoA( const WCHAR *str ) static const char magic_loopback_addr[] = {127, 12, 34, 56}; -const char *debugstr_sockaddr( const struct sockaddr *addr ) DECLSPEC_HIDDEN; +const char *debugstr_sockaddr( const struct sockaddr *addr ); struct per_thread_data { @@ -88,9 +88,9 @@ struct per_thread_data char ntoa_buffer[16]; /* 4*3 digits + 3 '.' + 1 '\0' */ }; -extern int num_startup DECLSPEC_HIDDEN; +extern int num_startup; -struct per_thread_data *get_per_thread_data(void) DECLSPEC_HIDDEN; +struct per_thread_data *get_per_thread_data(void); struct getaddrinfo_params {

1 0

Alexandre Julliard : ntdll: Use RtlFindExportedRoutineByName to simplify loader initialization.
by Alexandre Julliard 24 Nov '23

24 Nov '23

Module: wine Branch: master Commit: d57c41990acde38f085da1c8dd6051e5fd287fb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d57c41990acde38f085da1c8dd6051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:27:44 2023 +0100 ntdll: Use RtlFindExportedRoutineByName to simplify loader initialization. --- dlls/ntdll/loader.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4bc7e66d76b..5b0d3f6b6ee 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4268,8 +4268,6 @@ void loader_init( CONTEXT *context, void **entry ) if (!imports_fixup_done) { MEMORY_BASIC_INFORMATION meminfo; - ANSI_STRING base_thread_init_thunk = RTL_CONSTANT_STRING( "BaseThreadInitThunk" ); - ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; @@ -4305,13 +4303,8 @@ void loader_init( CONTEXT *context, void **entry ) NtTerminateProcess( GetCurrentProcess(), status ); } node_kernel32 = kernel32->ldr.DdagNode; - if ((status = LdrGetProcedureAddress( kernel32->ldr.DllBase, &base_thread_init_thunk, - 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) - { - MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %lx\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - LdrGetProcedureAddress( kernel32->ldr.DllBase, &ctrl_routine, 0, (void **)&pCtrlRoutine ); + pBaseThreadInitThunk = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "BaseThreadInitThunk" ); + pCtrlRoutine = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "CtrlRoutine" ); actctx_init(); locale_init();

1 0

Alexandre Julliard : ntdll: Convert the ARM64EC context to ARM64 for syscalls.
by Alexandre Julliard 24 Nov '23

24 Nov '23

Module: wine Branch: master Commit: 2328a1d9df4ffeb66b958bb9becfc238fb039774 URL: https://gitlab.winehq.org/wine/wine/-/commit/2328a1d9df4ffeb66b958bb9becfc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:03:28 2023 +0100 ntdll: Convert the ARM64EC context to ARM64 for syscalls. --- dlls/ntdll/signal_arm64ec.c | 195 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 187 insertions(+), 8 deletions(-)

1 0

Alexandre Julliard : winedump: Display PE section offsets using their virtual address.
by Alexandre Julliard 24 Nov '23

24 Nov '23

Module: wine Branch: master Commit: 2d338e22f25a5d94a5a6d8944fcc39d3175799cc URL: https://gitlab.winehq.org/wine/wine/-/commit/2d338e22f25a5d94a5a6d8944fcc39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 14:03:44 2023 +0100 winedump: Display PE section offsets using their virtual address. --- tools/winedump/dump.c | 11 ++++++++--- tools/winedump/pe.c | 3 ++- tools/winedump/winedump.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index abfc2ab8c74..90602d43367 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -33,11 +33,11 @@ void *dump_base = NULL; size_t dump_total_len = 0; -void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ) +void dump_data_offset( const unsigned char *ptr, unsigned int size, unsigned int offset, const char *prefix ) { unsigned int i, j; - printf( "%s%08x: ", prefix, 0 ); + printf( "%s%08x: ", prefix, offset ); if (!ptr) { printf("NULL\n"); @@ -51,7 +51,7 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix printf( " " ); for (j = 0; j < 16; j++) printf( "%c", isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.' ); - if (i < size-1) printf( "\n%s%08x: ", prefix, i + 1 ); + if (i < size-1) printf( "\n%s%08x: ", prefix, offset + i + 1 ); } } if (i % 16) @@ -63,6 +63,11 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix printf( "\n" ); } +void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ) +{ + dump_data_offset( ptr, size, 0, prefix ); +} + static char* dump_want_n(unsigned sz) { static char buffer[64 * 1024]; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 3defdcd664b..a49c4e83d52 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -539,7 +539,8 @@ static void dump_sections(const void *base, const void* addr, unsigned num_sect) if (globals.do_dump_rawdata) { - dump_data((const unsigned char *)base + sectHead->PointerToRawData, sectHead->SizeOfRawData, " " ); + dump_data_offset((const unsigned char *)base + sectHead->PointerToRawData, + sectHead->SizeOfRawData, sectHead->VirtualAddress, " " ); printf("\n"); } } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 91b7170b774..3df2410a6c3 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -224,6 +224,7 @@ unsigned long Offset(const void* ptr); typedef void (*file_dumper)(void); BOOL dump_analysis(const char*, file_dumper, enum FileSig); +void dump_data_offset( const unsigned char *ptr, unsigned int size, unsigned int offset, const char *prefix ); void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ); const char* get_time_str( unsigned long ); unsigned int strlenW( const unsigned short *str );

1 0

Anton Baskanov : dmime: Requeue the note message instead of directly queueing MIDI note-off.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: bb7b49647b165cdc51a263d673901f9d88a70914 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb7b49647b165cdc51a263d673901f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Nov 18 21:18:35 2023 +0700 dmime: Requeue the note message instead of directly queueing MIDI note-off. --- dlls/dmime/performance.c | 23 ++++++++++++++++++----- dlls/dmime/tests/dmime.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 1236766afd9..1d1da250cc3 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -2057,12 +2057,25 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, DMUS_NOTE_PMSG *note = (DMUS_NOTE_PMSG *)msg; msg->mtTime += note->nOffset; - if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, - MIDI_NOTE_ON, note->bMidiValue, note->bVelocity))) - WARN("Failed to translate message to MIDI, hr %#lx\n", hr); - msg->mtTime += note->mtDuration; - if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE, + if (note->bFlags & DMUS_NOTEF_NOTEON) + { + if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + MIDI_NOTE_ON, note->bMidiValue, note->bVelocity))) + WARN("Failed to translate message to MIDI, hr %#lx\n", hr); + + if (note->mtDuration) + { + msg->mtTime -= note->nOffset; + msg->mtTime += max(1, note->mtDuration - 1); + if (FAILED(hr = IDirectMusicPerformance8_MusicToReferenceTime(performance, msg->mtTime, &msg->rtTime))) + return hr; + note->bFlags &= ~DMUS_NOTEF_NOTEON; + return DMUS_S_REQUEUE; + } + } + + if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, MIDI_NOTE_OFF, note->bMidiValue, 0))) WARN("Failed to translate message to MIDI, hr %#lx\n", hr); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 94f781d2796..b4b6d848fdc 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -65,13 +65,13 @@ static double scale_music_time(MUSIC_TIME time, double tempo) return (600000000.0 * time) / (tempo * 768.0); } -#define check_dmus_note_pmsg(a, b, c, d, e, f, g, h, i) check_dmus_note_pmsg_(__LINE__, a, b, c, d, e, f, g, h, i) +#define check_dmus_note_pmsg(a, b, c, d, e, f, g) check_dmus_note_pmsg_(__LINE__, a, b, c, d, e, f, g) static void check_dmus_note_pmsg_(int line, DMUS_NOTE_PMSG *msg, MUSIC_TIME time, UINT chan, - UINT duration, UINT key, UINT vel, UINT flags, BOOL time_todo, BOOL flags_todo) + UINT duration, UINT key, UINT vel, UINT flags) { ok_(__FILE__, line)(msg->dwSize == sizeof(*msg), "got dwSize %lu\n", msg->dwSize); ok_(__FILE__, line)(!!msg->rtTime, "got rtTime %I64u\n", msg->rtTime); - todo_wine_if(time_todo) ok_(__FILE__, line)(abs(msg->mtTime - time) < 10, "got mtTime %lu\n", msg->mtTime); + ok_(__FILE__, line)(abs(msg->mtTime - time) < 10, "got mtTime %lu\n", msg->mtTime); ok_(__FILE__, line)(msg->dwPChannel == chan, "got dwPChannel %lu\n", msg->dwPChannel); ok_(__FILE__, line)(!!msg->dwVirtualTrackID, "got dwVirtualTrackID %lu\n", msg->dwVirtualTrackID); ok_(__FILE__, line)(msg->dwType == DMUS_PMSGT_NOTE, "got %#lx\n", msg->dwType); @@ -85,7 +85,7 @@ static void check_dmus_note_pmsg_(int line, DMUS_NOTE_PMSG *msg, MUSIC_TIME time /* FIXME: ok_(__FILE__, line)(!msg->bBeat, "got bBeat %u\n", msg->bBeat); */ /* FIXME: ok_(__FILE__, line)(!msg->bGrid, "got bGrid %u\n", msg->bGrid); */ ok_(__FILE__, line)(msg->bVelocity == vel, "got bVelocity %u\n", msg->bVelocity); - todo_wine_if(flags_todo) ok_(__FILE__, line)(msg->bFlags == flags, "got bFlags %#x\n", msg->bFlags); + ok_(__FILE__, line)(msg->bFlags == flags, "got bFlags %#x\n", msg->bFlags); ok_(__FILE__, line)(!msg->bTimeRange, "got bTimeRange %u\n", msg->bTimeRange); ok_(__FILE__, line)(!msg->bDurRange, "got bDurRange %u\n", msg->bDurRange); ok_(__FILE__, line)(!msg->bVelRange, "got bVelRange %u\n", msg->bVelRange); @@ -2633,11 +2633,11 @@ static void test_performance_tool(void) *note = note60; hr = IDirectMusicTool_ProcessPMsg(tool, performance, (DMUS_PMSG *)note); - todo_wine ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); - todo_wine ok(fabs(note->rtTime - note60.rtTime - scale_music_time(999, 120.0)) < 10.0, + ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); + ok(fabs(note->rtTime - note60.rtTime - scale_music_time(999, 120.0)) < 10.0, "got %I64d\n", note->rtTime - note60.rtTime); - todo_wine ok(note->mtTime - note60.mtTime == 999, "got %ld\n", note->mtTime - note60.mtTime); - check_dmus_note_pmsg(note, note60.mtTime + 999, 0, 1000, 60, 127, 0, FALSE, TRUE); + ok(note->mtTime - note60.mtTime == 999, "got %ld\n", note->mtTime - note60.mtTime); + check_dmus_note_pmsg(note, note60.mtTime + 999, 0, 1000, 60, 127, 0); hr = IDirectMusicPerformance_GetTime(performance, NULL, &note60.mtTime); ok(hr == S_OK, "got %#lx\n", hr); @@ -2647,11 +2647,11 @@ static void test_performance_tool(void) *note = note60; note->nOffset = 1000; hr = IDirectMusicTool_ProcessPMsg(tool, performance, (DMUS_PMSG *)note); - todo_wine ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); - todo_wine ok(fabs(note->rtTime - note60.rtTime - scale_music_time(999, 120.0)) < 10.0, + ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); + ok(fabs(note->rtTime - note60.rtTime - scale_music_time(999, 120.0)) < 10.0, "got %I64d\n", note->rtTime - note60.rtTime); - todo_wine ok(note->mtTime - note60.mtTime == 999, "got %ld\n", note->mtTime - note60.mtTime); - check_dmus_note_pmsg(note, note60.mtTime + 999, 0, 1000, 60, 127, 0, TRUE, TRUE); + ok(note->mtTime - note60.mtTime == 999, "got %ld\n", note->mtTime - note60.mtTime); + check_dmus_note_pmsg(note, note60.mtTime + 999, 0, 1000, 60, 127, 0); hr = IDirectMusicPerformance_GetTime(performance, NULL, &note60.mtTime); ok(hr == S_OK, "got %#lx\n", hr); @@ -2661,11 +2661,11 @@ static void test_performance_tool(void) *note = note60; note->mtDuration = 2; hr = IDirectMusicTool_ProcessPMsg(tool, performance, (DMUS_PMSG *)note); - todo_wine ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); - todo_wine ok(fabs(note->rtTime - note60.rtTime - scale_music_time(1, 120.0)) < 10.0, + ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); + ok(fabs(note->rtTime - note60.rtTime - scale_music_time(1, 120.0)) < 10.0, "got %I64d\n", note->rtTime - note60.rtTime); - todo_wine ok(note->mtTime - note60.mtTime == 1, "got %ld\n", note->mtTime - note60.mtTime); - check_dmus_note_pmsg(note, note60.mtTime + 1, 0, 2, 60, 127, 0, FALSE, TRUE); + ok(note->mtTime - note60.mtTime == 1, "got %ld\n", note->mtTime - note60.mtTime); + check_dmus_note_pmsg(note, note60.mtTime + 1, 0, 2, 60, 127, 0); hr = IDirectMusicPerformance_GetTime(performance, NULL, &note60.mtTime); ok(hr == S_OK, "got %#lx\n", hr); @@ -2675,11 +2675,11 @@ static void test_performance_tool(void) *note = note60; note->mtDuration = 1; hr = IDirectMusicTool_ProcessPMsg(tool, performance, (DMUS_PMSG *)note); - todo_wine ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); - todo_wine ok(fabs(note->rtTime - note60.rtTime - scale_music_time(1, 120.0)) < 10.0, + ok(hr == DMUS_S_REQUEUE, "got %#lx\n", hr); + ok(fabs(note->rtTime - note60.rtTime - scale_music_time(1, 120.0)) < 10.0, "got %I64d\n", note->rtTime - note60.rtTime); ok(note->mtTime - note60.mtTime == 1, "got %ld\n", note->mtTime - note60.mtTime); - check_dmus_note_pmsg(note, note60.mtTime + 1, 0, 1, 60, 127, 0, FALSE, TRUE); + check_dmus_note_pmsg(note, note60.mtTime + 1, 0, 1, 60, 127, 0); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr); @@ -3763,13 +3763,13 @@ static void test_sequence_track(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); ok(!ret, "got %#lx\n", ret); - check_dmus_note_pmsg(note, 0, 0, 500, 60, 120, DMUS_NOTEF_NOTEON, FALSE, FALSE); + check_dmus_note_pmsg(note, 0, 0, 500, 60, 120, DMUS_NOTEF_NOTEON); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); ok(!ret, "got %#lx\n", ret); - check_dmus_note_pmsg(note, 1000, 1, 200, 50, 100, DMUS_NOTEF_NOTEON, FALSE, FALSE); + check_dmus_note_pmsg(note, 1000, 1, 200, 50, 100, DMUS_NOTEF_NOTEON); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Anton Baskanov : dmsynth: Preserve event order when positions are equal.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 2c08013b8c28a6c7b6b034daa29623e20f553c76 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c08013b8c28a6c7b6b034daa29623… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Nov 11 11:40:50 2023 +0700 dmsynth: Preserve event order when positions are equal. Fixes hanging notes that occur when noteon gets reordered with noteoff. --- dlls/dmsynth/synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index bbe77e43cc9..222481c8769 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -977,7 +977,7 @@ static HRESULT WINAPI synth_PlayBuffer(IDirectMusicSynth8 *iface, EnterCriticalSection(&This->cs); LIST_FOR_EACH_ENTRY(next_event, &This->events, struct event, entry) - if (next_event->position >= event->position) break; + if (next_event->position > event->position) break; list_add_before(&next_event->entry, &event->entry); LeaveCriticalSection(&This->cs); }

1 0

Anton Baskanov : dmsynth: Use time instead of position to order events.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 88c7e93575721c6b6884f912737de8184b74f780 URL: https://gitlab.winehq.org/wine/wine/-/commit/88c7e93575721c6b6884f912737de8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Nov 11 12:39:50 2023 +0700 dmsynth: Use time instead of position to order events. Different time values can map to the same position. --- dlls/dmsynth/synth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 222481c8769..3eed05f35a0 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -322,6 +322,7 @@ struct preset struct event { struct list entry; + REFERENCE_TIME time; LONGLONG position; BYTE midi[3]; }; @@ -973,11 +974,12 @@ static HRESULT WINAPI synth_PlayBuffer(IDirectMusicSynth8 *iface, { if (!(event = calloc(1, sizeof(*event)))) return E_OUTOFMEMORY; memcpy(event->midi, data, head->cbEvent); + event->time = time + head->rtDelta; event->position = position; EnterCriticalSection(&This->cs); LIST_FOR_EACH_ENTRY(next_event, &This->events, struct event, entry) - if (next_event->position > event->position) break; + if (next_event->time > event->time) break; list_add_before(&next_event->entry, &event->entry); LeaveCriticalSection(&This->cs); }

1 0