August 2021 - Wine-Commits - list.winehq.org

Eric Pouech : winedump: Update support for S_COMPILE* records.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 7499b98ec8f1eed843ec2302e6356668c1df562c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7499b98ec8f1eed843ec2302… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:23:13 2021 +0200 winedump: Update support for S_COMPILE* records. Don't mix up S_COMPILE records with compiland information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 34 +++++++-------- include/wine/mscvpdb.h | 62 +++++++++++++++++++++++---- tools/winedump/msc.c | 111 +++++++++++++++++++++++++------------------------ 3 files changed, 127 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7499b98ec8f1eed843ec…

1 0

Eric Pouech : winedump: Add some new bits in UDT's property field.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: fe9f0c7fcfaedde7947326a0e62e95973f9fa2bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9f0c7fcfaedde7947326a0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:22:54 2021 +0200 winedump: Add some new bits in UDT's property field. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 4885bb6e0b0..8053c79e450 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -256,10 +256,14 @@ static const char* get_property(unsigned prop) if (prop & 0x0040) X("w/casting-methods"); if (prop & 0x0080) X("forward"); if (prop & 0x0100) X("scoped"); + if (prop & 0x0200) X("decorated-name"); + if (prop & 0x0400) X("sealed-name"); + if (prop & 0x1800) pos += sprintf(tmp, "hfa%x", (prop >> 11) & 3); + if (prop & 0x2000) X("intrinsic"); + if (prop & 0xC000) pos += sprintf(tmp, "mocom%x", prop >> 14); #undef X - if (prop & ~0x01FF) pos += sprintf(tmp, "unk%x", prop & ~0x01FF); - else tmp[pos] = '\0'; + tmp[pos] = '\0'; assert(pos < sizeof(tmp)); return tmp; @@ -853,6 +857,8 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type str, type->struct_v3.n_element, get_property(type->struct_v3.property), type->struct_v3.fieldlist, type->struct_v3.derived, type->struct_v3.vshape, value); + if (type->union_v3.property & 0x200) + printf("\t\tDecorated name:%s\n", str + strlen(str) + 1); break; case LF_UNION_V1: @@ -878,6 +884,8 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type curr_type, str, type->union_v3.count, get_property(type->union_v3.property), type->union_v3.fieldlist, value); + if (type->union_v3.property & 0x200) + printf("\t\tDecorated name:%s\n", str + strlen(str) + 1); break; case LF_ENUM_V1: @@ -905,6 +913,8 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type type->enumeration_v3.fieldlist, type->enumeration_v3.count, get_property(type->enumeration_v3.property)); + if (type->union_v3.property & 0x200) + printf("\t\tDecorated name:%s\n", type->enumeration_v3.name + strlen(type->enumeration_v3.name) + 1); break; case LF_ARGLIST_V1:

1 0

Eric Pouech : winedump: Display function attributes in function/methods codeview records.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 1d9c8846b910eeaff5c5bf92d61b9ece1a8f5eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d9c8846b910eeaff5c5bf92… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:22:42 2021 +0200 winedump: Display function attributes in function/methods codeview records. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 8 ++++---- tools/winedump/msc.c | 34 +++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 1f7f1f305f2..87156041efa 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -309,7 +309,7 @@ union codeview_type short int id; unsigned short int rvtype; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short int params; unsigned short int arglist; } procedure_v1; @@ -320,7 +320,7 @@ union codeview_type short int id; unsigned int rvtype; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short int params; unsigned int arglist; } procedure_v2; @@ -333,7 +333,7 @@ union codeview_type unsigned short int class_type; unsigned short int this_type; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short int params; unsigned short int arglist; unsigned int this_adjust; @@ -347,7 +347,7 @@ union codeview_type unsigned int class_type; unsigned this_type; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short params; unsigned int arglist; unsigned int this_adjust; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 2155d876696..12229a615f7 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -265,6 +265,25 @@ static const char* get_property(unsigned prop) return tmp; } +static const char* get_funcattr(unsigned attr) +{ + static char tmp[1024]; + unsigned pos = 0; + + if (!attr) return "none"; +#define X(s) {if (pos) tmp[pos++] = ';'; strcpy(tmp + pos, s); pos += strlen(s);} + if (attr & 0x0001) X("C++ReturnUDT"); + if (attr & 0x0002) X("Ctor"); + if (attr & 0x0004) X("Ctor-w/virtualbase"); + if (attr & 0xfff8) pos += sprintf(tmp, "unk:%x", attr & 0xfff8); +#undef X + + tmp[pos] = '\0'; + assert(pos < sizeof(tmp)); + + return tmp; +} + static const char* get_machine(unsigned m) { const char* machine; @@ -865,27 +884,28 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type case LF_PROCEDURE_V1: /* FIXME: unknown could be the calling convention for the proc */ - printf("\t%x => Procedure V1 ret_type:%x call:%x (#%u args_type:%x)\n", + printf("\t%x => Procedure V1 ret_type:%x call:%x attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v1.rvtype, - type->procedure_v1.call, type->procedure_v1.params, - type->procedure_v1.arglist); + type->procedure_v1.call, get_funcattr(type->procedure_v1.funcattr), + type->procedure_v1.params, type->procedure_v1.arglist); break; case LF_PROCEDURE_V2: - printf("\t%x => Procedure V2 ret_type:%x unk:%x (#%u args_type:%x)\n", + printf("\t%x => Procedure V2 ret_type:%x unk:%x attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v2.rvtype, - type->procedure_v2.call, type->procedure_v2.params, - type->procedure_v2.arglist); + type->procedure_v2.call, get_funcattr(type->procedure_v2.funcattr), + type->procedure_v2.params, type->procedure_v2.arglist); break; case LF_MFUNCTION_V2: - printf("\t%x => MFunction V2 ret-type:%x call:%x class-type:%x this-type:%x\n" + printf("\t%x => MFunction V2 ret-type:%x call:%x class-type:%x this-type:%x attr:%s\n" "\t\t#args:%x args-type:%x this_adjust:%x\n", curr_type, type->mfunction_v2.rvtype, type->mfunction_v2.call, type->mfunction_v2.class_type, type->mfunction_v2.this_type, + get_funcattr(type->mfunction_v2.funcattr), type->mfunction_v2.params, type->mfunction_v2.arglist, type->mfunction_v2.this_adjust);

1 0

Zebediah Figura : ntoskrnl: Factor out remove_device().
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 4970266a70e7e2e3a6c18d1e0409e5c08658e569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4970266a70e7e2e3a6c18d1e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 20 19:01:25 2021 -0500 ntoskrnl: Factor out remove_device(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index d8eb62bc17a..6d53d79267e 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -366,6 +366,12 @@ static void send_remove_device_irp( DEVICE_OBJECT *device, UCHAR code ) send_pnp_irp( device, code ); } +static void remove_device( DEVICE_OBJECT *device ) +{ + send_remove_device_irp( device, IRP_MN_SURPRISE_REMOVAL ); + send_remove_device_irp( device, IRP_MN_REMOVE_DEVICE ); +} + static BOOL device_in_list( const DEVICE_RELATIONS *list, const DEVICE_OBJECT *device ) { ULONG i; @@ -440,8 +446,7 @@ static void handle_bus_relations( DEVICE_OBJECT *parent ) if (!device_in_list( relations, child )) { TRACE("Removing device %p.\n", child); - send_remove_device_irp( child, IRP_MN_SURPRISE_REMOVAL ); - send_remove_device_irp( child, IRP_MN_REMOVE_DEVICE ); + remove_device( child ); } ObDereferenceObject( child ); } @@ -1105,10 +1110,7 @@ void pnp_manager_stop_driver( struct wine_driver *driver ) struct root_pnp_device *device, *next; LIST_FOR_EACH_ENTRY_SAFE( device, next, &driver->root_pnp_devices, struct root_pnp_device, entry ) - { - send_remove_device_irp( device->device, IRP_MN_SURPRISE_REMOVAL ); - send_remove_device_irp( device->device, IRP_MN_REMOVE_DEVICE ); - } + remove_device( device->device ); } void pnp_manager_stop(void) @@ -1181,9 +1183,7 @@ void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ) LIST_FOR_EACH_ENTRY_SAFE( pnp_device, next, &driver->root_pnp_devices, struct root_pnp_device, entry ) { TRACE("Removing device %s.\n", debugstr_w(pnp_device->id)); - - send_remove_device_irp( pnp_device->device, IRP_MN_SURPRISE_REMOVAL ); - send_remove_device_irp( pnp_device->device, IRP_MN_REMOVE_DEVICE ); + remove_device( pnp_device->device ); } list_move_head( &driver->root_pnp_devices, &new_list );

1 0

Huw Davies : winewrapper: Add dlls/ntdll to the library path so macOS can find ntdll.so.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 691bfa262824b5244de2201ec428d0c91e2ddb6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=691bfa262824b5244de2201e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 23 07:30:11 2021 +0100 winewrapper: Add dlls/ntdll to the library path so macOS can find ntdll.so. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winewrapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winewrapper b/tools/winewrapper index 2206d7c4446..93d44bcd06c 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -69,9 +69,9 @@ if [ "`uname -s`" = "Darwin" ] then if [ -n "$DYLD_LIBRARY_PATH" ] then - DYLD_LIBRARY_PATH="$topdir/libs/wine:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll:$DYLD_LIBRARY_PATH" else - DYLD_LIBRARY_PATH="$topdir/libs/wine" + DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll" fi export DYLD_LIBRARY_PATH else

1 0

Huw Davies : winegcc: Add a @loader_path to help the macOS loader find ntdll.so.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 9af226c8267020583c949f7fcc8a8ff39bba5d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af226c8267020583c949f7f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 23 07:30:10 2021 +0100 winegcc: Add a @loader_path to help the macOS loader find ntdll.so. On macOS unixlibs that link to ntdll.so currently fail to load. It appears the macOS loader needs to be able to locate the file even if the library is already loaded. This patch changes the LC_ID_DYLIB name of ntdll.so to "@loader_path/ntdll.so" so that when other unixlibs link against this they will insert that name into their LC_LOAD_DYLIB entry for ntdll.so. While changing only ntdll.so is necessary, for simplicity this patch changes all unixlibs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51632 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 426336e4536..710f6dc900d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -492,6 +492,11 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, opts->image_base ); } if (opts->strip) strarray_add( flags, "-Wl,-x" ); + if (opts->unix_lib) + { + strarray_add( flags, "-install_name" ); + strarray_add( flags, strmake( "@loader_path/%s.so", output_name ) ); + } strarray_addall( link_args, flags ); return link_args;

1 0

Zhiyi Zhang : light.msstyles: Add more TreeView HiDPI images.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 4d6f1fe9adc0b8e195b04027e3aa8c755b4cc02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d6f1fe9adc0b8e195b04027… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 23 12:08:55 2021 +0800 light.msstyles: Add more TreeView HiDPI images. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 +++-- .../blue_treeview_expand_collapse_10px.bmp | Bin 938 -> 0 bytes .../blue_treeview_expand_collapse_11px.bmp | Bin 0 -> 1106 bytes ....svg => blue_treeview_expand_collapse_11px.svg} | 8 ++--- .../blue_treeview_expand_collapse_13px.bmp | Bin 0 -> 1490 bytes ....svg => blue_treeview_expand_collapse_13px.svg} | 8 ++--- .../blue_treeview_expand_collapse_15px.bmp | Bin 1938 -> 0 bytes .../blue_treeview_expand_collapse_16px.bmp | Bin 0 -> 2186 bytes .../blue_treeview_expand_collapse_16px.svg | 14 ++++++++ .../blue_treeview_expand_collapse_18px.bmp | Bin 0 -> 2730 bytes .../blue_treeview_expand_collapse_18px.svg | 16 +++++++++ .../blue_treeview_expand_collapse_20px.bmp | Bin 0 -> 3338 bytes .../blue_treeview_expand_collapse_20px.svg | 16 +++++++++ .../blue_treeview_expand_collapse_23px.bmp | Bin 0 -> 4370 bytes .../blue_treeview_expand_collapse_23px.svg | 16 +++++++++ dlls/light.msstyles/light.rc | 36 ++++++++++++++++----- 16 files changed, 102 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d6f1fe9adc0b8e195b0…

1 0

Zebediah Figura : ntoskrnl: Dereference the device children in IoDeleteDevice().
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: e56e4f97a4eab649b06cc4241ee0a9a4f968e45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e56e4f97a4eab649b06cc424… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 20 19:01:24 2021 -0500 ntoskrnl: Dereference the device children in IoDeleteDevice(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7f5ca846db2..fb3f9a23152 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1628,9 +1628,17 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) { struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); DEVICE_OBJECT **prev = &device->DriverObject->DeviceObject; + DEVICE_RELATIONS *children; + unsigned int i; + while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; - ExFreePool( wine_device->children ); + if ((children = wine_device->children)) + { + for (i = 0; i < children->Count; ++i) + ObDereferenceObject( children->Objects[i] ); + ExFreePool( children ); + } ObDereferenceObject( device ); } }

1 0

Zhiyi Zhang : light.msstyles: Add TrueSizeScalingType property to TrueSize sizing parts.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 05fe57f58ad0e23f06bebf315297829859fa7bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05fe57f58ad0e23f06bebf31… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 23 12:09:48 2021 +0800 light.msstyles: Add TrueSizeScalingType property to TrueSize sizing parts. When SizingType property value is TrueSize, theme part images are scaled only when TrueSizeScalingType property value is DPI or Size. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5c67480f69a..76adf8f8398 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -207,6 +207,7 @@ BLUE_INI TEXTFILE "ImageCount = 12\r\n" "MirrorImage = False\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "Transparent = True\r\n" "ImageFile1 = blue_checkbox_13px.bmp\r\n" @@ -242,6 +243,7 @@ BLUE_INI TEXTFILE "ContentMargins = 0, 0, 0, 0\r\n" "ImageCount = 8\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_radiobutton_13px.bmp\r\n" "ImageFile2 = blue_radiobutton_16px.bmp\r\n" @@ -304,6 +306,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "Transparent = True\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" @@ -556,6 +559,7 @@ BLUE_INI TEXTFILE "[ScrollBar.SizeBox]\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" @@ -654,6 +658,7 @@ BLUE_INI TEXTFILE "ContentMargins = 0, 0, 0, 0\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" @@ -860,6 +865,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "SizingType = TrueSize\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = true\r\n" "ImageFile1 = blue_trackbar_thumb_up_11px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_up_15px.bmp\r\n" @@ -875,6 +881,7 @@ BLUE_INI TEXTFILE "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_trackbar_thumb_down_11px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_down_15px.bmp\r\n" @@ -890,6 +897,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_trackbar_thumb_left_19px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_left_25px.bmp\r\n" @@ -905,6 +913,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_trackbar_thumb_right_19px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_right_25px.bmp\r\n" @@ -937,6 +946,7 @@ BLUE_INI TEXTFILE "[Tooltip.Close]\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 3\r\n" "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" @@ -968,6 +978,7 @@ BLUE_INI TEXTFILE "ImageCount = 2\r\n" "ImageLayout = vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" "ImageFile2 = blue_treeview_expand_collapse_11px.bmp\r\n"

1 0

Eric Pouech : winedump: Dump calling convention attributes for CodeView.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: a9c552fe7fa4eca2eba71cc83e9569638aa7458c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c552fe7fa4eca2eba71cc8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:22:48 2021 +0200 winedump: Dump calling convention attributes for CodeView. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 8 ++++---- include/cvconst.h | 3 +++ include/wine/mscvpdb.h | 8 ++++---- tools/winedump/msc.c | 56 +++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b6811ea97f5..25300aa6f90 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1288,7 +1288,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, break; case LF_PROCEDURE_V1: - symt = codeview_new_func_signature(ctp, existing, type->procedure_v1.call); + symt = codeview_new_func_signature(ctp, existing, type->procedure_v1.callconv); if (details) { codeview_add_type(curr_type, symt); @@ -1299,7 +1299,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, } break; case LF_PROCEDURE_V2: - symt = codeview_new_func_signature(ctp, existing,type->procedure_v2.call); + symt = codeview_new_func_signature(ctp, existing,type->procedure_v2.callconv); if (details) { codeview_add_type(curr_type, symt); @@ -1314,7 +1314,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - symt = codeview_new_func_signature(ctp, existing, type->mfunction_v1.call); + symt = codeview_new_func_signature(ctp, existing, type->mfunction_v1.callconv); if (details) { codeview_add_type(curr_type, symt); @@ -1328,7 +1328,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - symt = codeview_new_func_signature(ctp, existing, type->mfunction_v2.call); + symt = codeview_new_func_signature(ctp, existing, type->mfunction_v2.callconv); if (details) { codeview_add_type(curr_type, symt); diff --git a/include/cvconst.h b/include/cvconst.h index 39829c73592..95fdc9c73e5 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -720,6 +720,9 @@ typedef enum CV_call_e CV_CALL_TRICALL, CV_CALL_SH5CALL, CV_CALL_M32RCALL, + CV_CALL_CLRCALL, + CV_CALL_INLINE, + CV_CALL_NEAR_VECTOR, CV_CALL_RESERVED, } CV_call_e; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 87156041efa..036c65df0c1 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -308,7 +308,7 @@ union codeview_type unsigned short int len; short int id; unsigned short int rvtype; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short int params; unsigned short int arglist; @@ -319,7 +319,7 @@ union codeview_type unsigned short int len; short int id; unsigned int rvtype; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short int params; unsigned int arglist; @@ -332,7 +332,7 @@ union codeview_type unsigned short int rvtype; unsigned short int class_type; unsigned short int this_type; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short int params; unsigned short int arglist; @@ -346,7 +346,7 @@ union codeview_type unsigned int rvtype; unsigned int class_type; unsigned this_type; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short params; unsigned int arglist; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 12229a615f7..4885bb6e0b0 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -410,6 +410,49 @@ static const char* get_language(unsigned l) return lang; } +static const char* get_callconv(unsigned cc) +{ + const char* callconv; + + switch (cc) + { + case CV_CALL_NEAR_C: callconv = "near C"; break; + case CV_CALL_FAR_C: callconv = "far C"; break; + case CV_CALL_NEAR_PASCAL: callconv = "near pascal"; break; + case CV_CALL_FAR_PASCAL: callconv = "far pascal"; break; + case CV_CALL_NEAR_FAST: callconv = "near fast"; break; + case CV_CALL_FAR_FAST: callconv = "far fast"; break; + case CV_CALL_SKIPPED: callconv = "skipped"; break; + case CV_CALL_NEAR_STD: callconv = "near std"; break; + case CV_CALL_FAR_STD: callconv = "far std"; break; + case CV_CALL_NEAR_SYS: callconv = "near sys"; break; + case CV_CALL_FAR_SYS: callconv = "far sys"; break; + case CV_CALL_THISCALL: callconv = "this call"; break; + case CV_CALL_MIPSCALL: callconv = "mips call"; break; + case CV_CALL_GENERIC: callconv = "generic"; break; + case CV_CALL_ALPHACALL: callconv = "alpha call"; break; + case CV_CALL_PPCCALL: callconv = "ppc call"; break; + case CV_CALL_SHCALL: callconv = "sh call"; break; + case CV_CALL_ARMCALL: callconv = "arm call"; break; + case CV_CALL_AM33CALL: callconv = "am33 call"; break; + case CV_CALL_TRICALL: callconv = "tri call"; break; + case CV_CALL_SH5CALL: callconv = "sh5 call"; break; + case CV_CALL_M32RCALL: callconv = "m32r call"; break; + case CV_CALL_CLRCALL: callconv = "clr call"; break; + case CV_CALL_INLINE: callconv = "inline"; break; + case CV_CALL_NEAR_VECTOR: callconv = "near vector"; break; + case CV_CALL_RESERVED: callconv = "reserved"; break; + default: + { + static char tmp[16]; + sprintf(tmp, "callconv=%x", cc); + callconv = tmp; + } + break; + } + return callconv; +} + static void do_field(const unsigned char* start, const unsigned char* end) { /* @@ -883,26 +926,25 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type break; case LF_PROCEDURE_V1: - /* FIXME: unknown could be the calling convention for the proc */ - printf("\t%x => Procedure V1 ret_type:%x call:%x attr:%s (#%u args_type:%x)\n", + printf("\t%x => Procedure V1 ret_type:%x callconv:%s attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v1.rvtype, - type->procedure_v1.call, get_funcattr(type->procedure_v1.funcattr), + get_callconv(type->procedure_v1.callconv), get_funcattr(type->procedure_v1.funcattr), type->procedure_v1.params, type->procedure_v1.arglist); break; case LF_PROCEDURE_V2: - printf("\t%x => Procedure V2 ret_type:%x unk:%x attr:%s (#%u args_type:%x)\n", + printf("\t%x => Procedure V2 ret_type:%x callconv:%s attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v2.rvtype, - type->procedure_v2.call, get_funcattr(type->procedure_v2.funcattr), + get_callconv(type->procedure_v2.callconv), get_funcattr(type->procedure_v1.funcattr), type->procedure_v2.params, type->procedure_v2.arglist); break; case LF_MFUNCTION_V2: - printf("\t%x => MFunction V2 ret-type:%x call:%x class-type:%x this-type:%x attr:%s\n" + printf("\t%x => MFunction V2 ret-type:%x callconv:%s class-type:%x this-type:%x attr:%s\n" "\t\t#args:%x args-type:%x this_adjust:%x\n", curr_type, type->mfunction_v2.rvtype, - type->mfunction_v2.call, + get_callconv(type->mfunction_v2.callconv), type->mfunction_v2.class_type, type->mfunction_v2.this_type, get_funcattr(type->mfunction_v2.funcattr),

1 0