May 2024 - Wine-commits - list.winehq.org

Elizabeth Figura : wined3d: Remove some no longer used wined3d_context fields.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: abc44d4620b85eeafdae8da0b17d8cae0403695f URL: https://gitlab.winehq.org/wine/wine/-/commit/abc44d4620b85eeafdae8da0b17d8c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 17:17:42 2024 -0500 wined3d: Remove some no longer used wined3d_context fields. --- dlls/wined3d/wined3d_private.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b8d9457a38..aaa8dc6472f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1906,17 +1906,16 @@ struct wined3d_context DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; + DWORD update_primitive_type : 1; + DWORD update_patch_vertex_count : 1; DWORD last_was_rhw : 1; /* True iff last draw_primitive was in xyzrhw mode. */ - DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; DWORD last_was_diffuse : 1; DWORD last_was_specular : 1; DWORD last_was_normal : 1; DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; - DWORD last_was_ckey : 1; DWORD last_was_dual_source_blend : 1; - DWORD texShaderBumpMap : 8; /* WINED3D_MAX_FFP_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_FFP_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_FFP_TEXTURES, 8 */ @@ -1927,10 +1926,8 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; - DWORD update_primitive_type : 1; - DWORD update_patch_vertex_count : 1; DWORD update_multisample_state : 1; - DWORD padding : 14; + DWORD padding : 24; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ @@ -1940,7 +1937,6 @@ struct wined3d_context void *shader_backend_data; - void *fragment_pipe_data; struct wined3d_stream_info stream_info;

1 0

Elizabeth Figura : wined3d: Remove no longer used "exponent" and "cutoff" precomputed fields.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 8a1448d1d1b05d657de076496a3cf74113cfe735 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a1448d1d1b05d657de076496a3cf7… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 18:17:40 2024 -0500 wined3d: Remove no longer used "exponent" and "cutoff" precomputed fields. --- dlls/wined3d/cs.c | 2 -- dlls/wined3d/stateblock.c | 31 ------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 35 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a462f717bdf..958c23d76a7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2070,8 +2070,6 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) light_info->OriginalParms = op->light.OriginalParms; light_info->position = op->light.position; light_info->direction = op->light.direction; - light_info->exponent = op->light.exponent; - light_info->cutoff = op->light.cutoff; } void wined3d_device_context_emit_set_light(struct wined3d_device_context *context, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ad5753e5d99..6c44733c8bb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -2325,7 +2325,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont unsigned int light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; - float rho; if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) return; @@ -2348,7 +2347,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->position.y = light->position.y; object->position.z = light->position.z; object->position.w = 1.0f; - object->cutoff = 180.0f; /* FIXME: Range */ break; @@ -2358,8 +2356,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->direction.y = -light->direction.y; object->direction.z = -light->direction.z; object->direction.w = 0.0f; - object->exponent = 0.0f; - object->cutoff = 180.0f; break; case WINED3D_LIGHT_SPOT: @@ -2375,33 +2371,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->direction.z = light->direction.z; object->direction.w = 0.0f; - /* opengl-ish and d3d-ish spot lights use too different models - * for the light "intensity" as a function of the angle towards - * the main light direction, so we only can approximate very - * roughly. However, spot lights are rather rarely used in games - * (if ever used at all). Furthermore if still used, probably - * nobody pays attention to such details. */ - if (!light->falloff) - { - /* Falloff = 0 is easy, because d3d's and opengl's spot light - * equations have the falloff resp. exponent parameter as an - * exponent, so the spot light lighting will always be 1.0 for - * both of them, and we don't have to care for the rest of the - * rather complex calculation. */ - object->exponent = 0.0f; - } - else - { - rho = light->theta + (light->phi - light->theta) / (2 * light->falloff); - if (rho < 0.0001f) - rho = 0.0001f; - object->exponent = -0.3f / logf(cosf(rho / 2)); - } - - if (object->exponent > 128.0f) - object->exponent = 128.0f; - - object->cutoff = (float)(light->phi * 90 / M_PI); /* FIXME: Range */ break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aaa8dc6472f..3040e40d5e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2080,8 +2080,6 @@ struct wined3d_light_info /* Converted parms to speed up swapping lights */ struct wined3d_vec4 position; struct wined3d_vec4 direction; - float exponent; - float cutoff; struct rb_entry entry; struct list changed_entry;

1 0

Elizabeth Figura : wined3d: Remove the no longer used ignore_textype argument of wined3d_ffp_get_fs_settings().
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: ac23ca135291958218d63266d9268ed671ffc676 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac23ca135291958218d63266d9268e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Apr 25 16:00:01 2024 -0500 wined3d: Remove the no longer used ignore_textype argument of wined3d_ffp_get_fs_settings(). --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 9 +++------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba61fe5a3cd..ea79e0361e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10408,7 +10408,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings; - wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings, FALSE); + wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e4ff36425ab..a1c5a00d51f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6257,8 +6257,8 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr *dst = tmp; } -void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, - struct ffp_frag_settings *settings, BOOL ignore_textype) +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct ffp_frag_settings *settings) { #define ARG1 0x01 #define ARG2 0x02 @@ -6324,10 +6324,7 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; else settings->op[i].color_fixup = texture->resource.format->color_fixup; - if (ignore_textype) - settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; - else - settings->op[i].tex_type = texture->resource.gl_type; + settings->op[i].tex_type = texture->resource.gl_type; } else { settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3040e40d5e9..67ddf6f88cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2678,8 +2678,8 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb extern const struct wined3d_parent_ops wined3d_null_parent_ops; -void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, - struct ffp_frag_settings *settings, BOOL ignore_textype); +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct ffp_frag_settings *settings); const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings); void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc);

1 0

Alistair Leslie-Hughes : include: Add LOGFONTA/W typedef in shtypes.idl.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 4aed0ef880e341fad73af6291d88ee4fe568e617 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aed0ef880e341fad73af6291d88ee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 30 07:01:23 2024 +1000 include: Add LOGFONTA/W typedef in shtypes.idl. --- include/shtypes.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/include/shtypes.idl b/include/shtypes.idl index c83562a24bb..41b80789e0e 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -182,3 +182,50 @@ typedef [v1_enum] enum DEVICE_SCALE_FACTOR SCALE_450_PERCENT = 450, SCALE_500_PERCENT = 500 } DEVICE_SCALE_FACTOR; + +cpp_quote( "#ifndef LF_FACESIZE") +#define LF_FACESIZE 32 + +typedef struct tagLOGFONTA +{ + LONG lfHeight; + LONG lfWidth; + LONG lfEscapement; + LONG lfOrientation; + LONG lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + CHAR lfFaceName[LF_FACESIZE]; +} LOGFONTA; + +typedef struct tagLOGFONTW +{ + LONG lfHeight; + LONG lfWidth; + LONG lfEscapement; + LONG lfOrientation; + LONG lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + WCHAR lfFaceName[LF_FACESIZE]; +} LOGFONTW; + +#ifdef UNICODE + typedef LOGFONTW LOGFONT; +#else + typedef LOGFONTA LOGFONT; +#endif + +cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : include: Add IPreviewHandler* interfaces.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 447f817445807cd7b75cd3b69d5d1f0aee4c3868 URL: https://gitlab.winehq.org/wine/wine/-/commit/447f817445807cd7b75cd3b69d5d1f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 08:34:40 2024 +1000 include: Add IPreviewHandler* interfaces. --- include/shobjidl.idl | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 8aa24ea86fc..886cff89ef9 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3844,6 +3844,21 @@ interface IApplicationActivationManager : IUnknown [out] DWORD *processid); } +[ + object, + uuid(8895b1c6-b41f-4c1c-a562-0d564250836f), +] +interface IPreviewHandler : IUnknown +{ + HRESULT SetWindow([in] HWND hwnd, [in] const RECT *rect); + HRESULT SetRect([in] const RECT *rect); + HRESULT DoPreview(); + HRESULT Unload(); + HRESULT SetFocus(); + HRESULT QueryFocus([out] HWND *hwnd); + HRESULT TranslateAccelerator([in] MSG *msg); +} + [ object, uuid(fec87aaf-35f9-447a-adb7-20234491401a), @@ -3861,6 +3876,18 @@ interface IPreviewHandlerFrame : IUnknown HRESULT TranslateAccelerator([in] MSG *msg); } +[ + object, + uuid(196bf9a5-b346-4ef0-aa1e-5dcdb76768b1), + pointer_default(unique) +] +interface IPreviewHandlerVisuals : IUnknown +{ + HRESULT SetBackgroundColor([in] COLORREF color); + HRESULT SetFont([in] const LOGFONTW *logfont); + HRESULT SetTextColor([in] COLORREF color); +} + /***************************************************************************** * ShellObjects typelibrary */

1 0

Alistair Leslie-Hughes : include: Correct IRowsetNotify HROW parameter type.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: b6eada5e2f9e3c86c18df118cddd20e6212f64de URL: https://gitlab.winehq.org/wine/wine/-/commit/b6eada5e2f9e3c86c18df118cddd20… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 08:28:36 2024 +1000 include: Correct IRowsetNotify HROW parameter type. --- dlls/msdaps/usrmarshal.c | 4 ++-- include/rstnot.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 10b840b1991..48308c7ee71 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1180,14 +1180,14 @@ HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTE return hr; } -HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, +HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); return IRowsetNotify_RemoteOnRowChange_Proxy(This, rowset, rows, hrows, reason, phase, cantdeny); } -HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, +HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); diff --git a/include/rstnot.idl b/include/rstnot.idl index 9e6975f9c78..048ac887b4f 100644 --- a/include/rstnot.idl +++ b/include/rstnot.idl @@ -49,7 +49,7 @@ interface IRowsetNotify : IUnknown [local] HRESULT OnRowChange([in] IRowset *rowset, [in] DBCOUNTITEM rows, - [in, size_is((ULONG)rows)] HROW *hrows, + [in, size_is((ULONG)rows)] const HROW *hrows, [in] DBREASON reason, [in] DBEVENTPHASE phase, [in] BOOL cantdeny); @@ -58,7 +58,7 @@ interface IRowsetNotify : IUnknown HRESULT RemoteOnRowChange( [in] IRowset *rowset, [in] DBCOUNTITEM rows, - [in, size_is((ULONG)rows)] HROW *hrows, + [in, size_is((ULONG)rows)] const HROW *hrows, [in] DBREASON reason, [in] DBEVENTPHASE phase, [in] BOOL cantdeny);

1 0

Alexandre Julliard : winedump: Print exported function names in the exception data.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 855017063aa9555623ee17944f24e33254c438eb URL: https://gitlab.winehq.org/wine/wine/-/commit/855017063aa9555623ee17944f24e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 22:02:30 2024 +0200 winedump: Print exported function names in the exception data. --- tools/winedump/pe.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 22260e5249b..e2a8354e537 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -662,19 +662,23 @@ static const char *find_export_from_rva( UINT rva ) const IMAGE_EXPORT_DIRECTORY *dir; const char *ret = NULL; - if (!(dir = get_dir( IMAGE_FILE_EXPORT_DIRECTORY ))) return NULL; - if (!(funcs = RVA( dir->AddressOfFunctions, dir->NumberOfFunctions * sizeof(DWORD) ))) return NULL; + if (!(dir = get_dir( IMAGE_FILE_EXPORT_DIRECTORY ))) return ""; + if (!(funcs = RVA( dir->AddressOfFunctions, dir->NumberOfFunctions * sizeof(DWORD) ))) return ""; names = RVA( dir->AddressOfNames, dir->NumberOfNames * sizeof(DWORD) ); ordinals = RVA( dir->AddressOfNameOrdinals, dir->NumberOfNames * sizeof(WORD) ); func_names = calloc( dir->NumberOfFunctions, sizeof(*func_names) ); for (i = 0; i < dir->NumberOfNames; i++) func_names[ordinals[i]] = names[i]; - for (i = 0; i < dir->NumberOfFunctions && !ret; i++) - if (funcs[i] == rva) ret = get_symbol_str( RVA( func_names[i], sizeof(DWORD) )); + for (i = 0; i < dir->NumberOfFunctions; i++) + { + if (funcs[i] != rva) continue; + if (func_names[i]) ret = get_symbol_str( RVA( func_names[i], sizeof(DWORD) )); + break; + } free( func_names ); - if (!ret && rva == PE_nt_headers->OptionalHeader.AddressOfEntryPoint) return "<EntryPoint>"; - return ret; + if (!ret && rva == PE_nt_headers->OptionalHeader.AddressOfEntryPoint) return " <EntryPoint>"; + return ret ? strmake( " (%s)", ret ) : ""; } static void dump_dir_exported_functions(void) @@ -854,7 +858,8 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct const struct unwind_info_x86_64 *info; unsigned int i, count; - printf( "\nFunction %08x-%08x:\n", function->BeginAddress, function->EndAddress ); + printf( "\nFunction %08x-%08x:%s\n", function->BeginAddress, function->EndAddress, + find_export_from_rva( function->BeginAddress )); if (function->UnwindData & 1) { const struct runtime_function_x86_64 *next = RVA( function->UnwindData & ~1, sizeof(*next) ); @@ -1000,9 +1005,10 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) WORD pf = 0, ef = 0, fpoffset = 0, stack = fnc->StackAdjust; const char *pfx = " ... "; - printf( "\nFunction %08x-%08x: (flag=%u ret=%u H=%u reg=%u R=%u L=%u C=%u)\n", + printf( "\nFunction %08x-%08x: flag=%u ret=%u H=%u reg=%u R=%u L=%u C=%u%s\n", fnc->BeginAddress & ~1, (fnc->BeginAddress & ~1) + fnc->FunctionLength * 2, - fnc->Flag, fnc->Ret, fnc->H, fnc->Reg, fnc->R, fnc->L, fnc->C ); + fnc->Flag, fnc->Ret, fnc->H, fnc->Reg, fnc->R, fnc->L, fnc->C, + find_export_from_rva( fnc->BeginAddress )); if (fnc->StackAdjust >= 0x03f4) { @@ -1124,9 +1130,9 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) count = info->count; words = info->words; - printf( "\nFunction %08x-%08x: (ver=%u X=%u E=%u F=%u)\n", fnc->BeginAddress & ~1, + printf( "\nFunction %08x-%08x: ver=%u X=%u E=%u F=%u%s\n", fnc->BeginAddress & ~1, (fnc->BeginAddress & ~1) + info->function_length * 2, - info->version, info->x, info->e, info->f ); + info->version, info->x, info->e, info->f, find_export_from_rva( fnc->BeginAddress | 1 )); if (!info->count && !info->words) { @@ -1654,8 +1660,8 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) { case 1: case 2: - printf( "\nFunction %08x-%08x:\n", func->BeginAddress, - func->BeginAddress + func->FunctionLength * 4 ); + printf( "\nFunction %08x-%08x:%s\n", func->BeginAddress, + func->BeginAddress + func->FunctionLength * 4, find_export_from_rva( func->BeginAddress )); printf( " len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", func->FunctionLength, func->Flag, func->RegF, func->RegI, func->H, func->CR, func->FrameSize ); @@ -1664,8 +1670,9 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) case 3: rva = func->UnwindData & ~3; parent_func = RVA( rva, sizeof(*parent_func) ); - printf( "\nFunction %08x-%08x:\n", func->BeginAddress, - func->BeginAddress + 12 /* adrl x16, <dest>; br x16 */ ); + printf( "\nFunction %08x-%08x:%s\n", func->BeginAddress, + func->BeginAddress + 12 /* adrl x16, <dest>; br x16 */, + find_export_from_rva( func->BeginAddress )); printf( " forward to parent %08x\n", parent_func->BeginAddress ); return; } @@ -1947,10 +1954,8 @@ static void dump_hybrid_metadata(void) for (i = 0; i < data->CodeRangesToEntryPointsCount; i++) { const char *name = find_export_from_rva( map[i].EntryPoint ); - printf( " %08x - %08x %08x", - (int)map[i].StartRva, (int)map[i].EndRva, (int)map[i].EntryPoint ); - if (name) printf( " %s", name ); - printf( "\n" ); + printf( " %08x - %08x %08x%s\n", + (int)map[i].StartRva, (int)map[i].EndRva, (int)map[i].EntryPoint, name ); } } @@ -1963,9 +1968,7 @@ static void dump_hybrid_metadata(void) for (i = 0; i < data->RedirectionMetadataCount; i++) { const char *name = find_export_from_rva( map[i].Source ); - printf( " %08x -> %08x", (int)map[i].Source, (int)map[i].Destination ); - if (name) printf( " (%s)", name ); - printf( "\n" ); + printf( " %08x -> %08x%s\n", (int)map[i].Source, (int)map[i].Destination, name ); } } break;

1 0

Alexandre Julliard : winedump: Print the export or import name of exception handlers.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: bb8ef91f46b21ac4ed6fbd5f9d958646dfadf7cf URL: https://gitlab.winehq.org/wine/wine/-/commit/bb8ef91f46b21ac4ed6fbd5f9d9586… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 14:38:01 2024 +0200 winedump: Print the export or import name of exception handlers. --- tools/winedump/pe.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 96 insertions(+), 6 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index e2a8354e537..cfb7b18fff7 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -681,6 +681,89 @@ static const char *find_export_from_rva( UINT rva ) return ret ? strmake( " (%s)", ret ) : ""; } +static const char *find_import_from_rva( UINT rva ) +{ + const IMAGE_IMPORT_DESCRIPTOR *imp; + + if (!(imp = get_dir( IMAGE_FILE_IMPORT_DIRECTORY ))) return ""; + + /* check for import thunk */ + switch (PE_nt_headers->FileHeader.Machine) + { + case IMAGE_FILE_MACHINE_AMD64: + { + const BYTE *ptr = RVA( rva, 6 ); + if (!ptr) return ""; + if (ptr[0] == 0xff && ptr[1] == 0x25) + { + rva += 6 + *(int *)(ptr + 2); + break; + } + if (ptr[0] == 0x48 && ptr[1] == 0xff && ptr[2] == 0x25) + { + rva += 7 + *(int *)(ptr + 3); + break; + } + return ""; + } + case IMAGE_FILE_MACHINE_ARM64: + { + const UINT *ptr = RVA( rva, sizeof(DWORD) ); + if ((ptr[0] & 0x9f00001f) == 0x90000010 && /* adrp x16, page */ + (ptr[1] & 0xffc003ff) == 0xf9400210 && /* ldr x16, [x16, #off] */ + ptr[2] == 0xd61f0200) /* br x16 */ + { + rva &= ~0xfff; + rva += ((ptr[0] & 0x00ffffe0) << 9) + ((ptr[0] & 0x60000000) >> 17); + rva += (ptr[1] & 0x003ffc00) >> 7; + break; + } + return ""; + } + default: + return ""; + } + + for ( ; imp->Name && imp->FirstThunk; imp++) + { + UINT imp_rva = imp->OriginalFirstThunk ? imp->OriginalFirstThunk : imp->FirstThunk; + UINT thunk_rva = imp->FirstThunk; + + if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + const IMAGE_THUNK_DATA64 *il = RVA( imp_rva, sizeof(DWORD) ); + for ( ; il && il->u1.Ordinal; il++, thunk_rva += sizeof(LONGLONG)) + { + if (thunk_rva != rva) continue; + if (IMAGE_SNAP_BY_ORDINAL64(il->u1.Ordinal)) + return strmake( " (-> #%u)", (WORD)IMAGE_ORDINAL64( il->u1.Ordinal )); + else + return strmake( " (-> %s)", get_symbol_str( RVA( (DWORD)il->u1.AddressOfData + 2, 1 ))); + } + } + else + { + const IMAGE_THUNK_DATA32 *il = RVA( imp_rva, sizeof(DWORD) ); + for ( ; il && il->u1.Ordinal; il++, thunk_rva += sizeof(LONG)) + { + if (thunk_rva != rva) continue; + if (IMAGE_SNAP_BY_ORDINAL32(il->u1.Ordinal)) + return strmake( " (-> #%u)", (WORD)IMAGE_ORDINAL32( il->u1.Ordinal )); + else + return strmake( " (-> %s)", get_symbol_str( RVA( (DWORD)il->u1.AddressOfData + 2, 1 ))); + } + } + } + return ""; +} + +static const char *get_function_name( UINT rva ) +{ + const char *name = find_export_from_rva( rva ); + if (!*name) name = find_import_from_rva( rva ); + return name; +} + static void dump_dir_exported_functions(void) { unsigned int size; @@ -975,8 +1058,12 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct return; } if (info->flags & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)) - printf( " handler %08x data at %08x\n", handler_data->handler, - (UINT)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); + { + UINT rva = function->UnwindData + ((const char *)(&handler_data->handler + 1) - (const char *)info); + const char *name = get_function_name( handler_data->handler ); + + printf( " handler %08x%s data at %08x\n", handler_data->handler, name, rva ); + } } static const BYTE armnt_code_lengths[256] = @@ -1365,11 +1452,12 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (info->x) { const unsigned int *handler; + const char *name; handler = RVA( rva, sizeof(*handler) ); rva = rva + sizeof(*handler); - - printf( " handler %08x data at %08x\n", *handler, rva); + name = get_function_name( *handler ); + printf( " handler %08x%s data at %08x\n", *handler, name, rva ); } } @@ -1708,13 +1796,15 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) } ptr = RVA( rva, codes * 4); rva += codes * 4; + dump_arm64_codes( ptr, codes * 4 ); if (info->x) { const UINT *handler = RVA( rva, sizeof(*handler) ); + const char *name = get_function_name( *handler ); + rva += sizeof(*handler); - printf( " handler: %08x data %08x\n", *handler, rva ); + printf( " handler: %08x%s data %08x\n", *handler, name, rva ); } - dump_arm64_codes( ptr, codes * 4 ); } static void dump_dir_exceptions(void)

1 0

Alexandre Julliard : winedump: Dump exception data for known exception handlers.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 02a6ad92ab51516823c33fcbad1bde922f5ca984 URL: https://gitlab.winehq.org/wine/wine/-/commit/02a6ad92ab51516823c33fcbad1bde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 14:38:51 2024 +0200 winedump: Dump exception data for known exception handlers. --- tools/winedump/pe.c | 350 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 350 insertions(+)

1 0

Davide Beatrici : winealsa: Return minimum period in get_device_period if requested.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 5c6e63bac21d3cbeed56ad76f45f16fa8fc76518 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c6e63bac21d3cbeed56ad76f45f16… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed May 29 21:28:18 2024 +0200 winealsa: Return minimum period in get_device_period if requested. --- dlls/winealsa.drv/alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index aa1ad4abe6c..3172e1ece81 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2153,7 +2153,7 @@ static NTSTATUS alsa_get_device_period(void *args) if (params->def_period) *params->def_period = def_period; if (params->min_period) - *params->min_period = def_period; + *params->min_period = min_period; params->result = S_OK;

1 0