wine-commits April 2023

wine-commits@winehq.org

1 participants
817 discussions

Piotr Caban : gdi32: Store palette in EMR_EOF record.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: f45baaa11e74a967fecebc6efbcbbbcf2821da01 URL: https://gitlab.winehq.org/wine/wine/-/commit/f45baaa11e74a967fecebc6efbcbbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 22:16:16 2023 +0200 gdi32: Store palette in EMR_EOF record. --- dlls/gdi32/emfdc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index cc8e78a3cb5..42330a22861 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -41,6 +41,9 @@ struct emf HBRUSH dc_brush; HPEN dc_pen; BOOL path; + DWORD palette_size; + DWORD palette_used; + PALETTEENTRY *palette; }; #define HANDLE_LIST_INC 20 @@ -394,6 +397,40 @@ static void emfdc_delete_object( HDC hdc, HGDIOBJ obj ) emf->cur_handles--; } +static BOOL emfdc_add_palette_entry( struct emf *emf, PALETTEENTRY *entry ) +{ + int i; + + for (i = 0; i < emf->palette_used; i++) + { + if (emf->palette[i].peRed == entry->peRed && + emf->palette[i].peGreen == entry->peGreen && + emf->palette[i].peBlue == entry->peBlue) return TRUE; + } + + if (emf->palette_size == emf->palette_used) + { + if (!emf->palette_size) + { + emf->palette = HeapAlloc( GetProcessHeap(), 0, + 8 * sizeof(*emf->palette) ); + if (!emf->palette) return FALSE; + emf->palette_size = 8; + } + else + { + void *new_palette = HeapReAlloc( GetProcessHeap(), 0, emf->palette, + 2 * emf->palette_size * sizeof(*emf->palette) ); + if (!new_palette) return FALSE; + emf->palette = new_palette; + emf->palette_size *= 2; + } + } + + emf->palette[emf->palette_used++] = *entry; + return TRUE; +} + static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) { DWORD index = 0; @@ -663,7 +700,10 @@ static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal ) return 0; for (i = 0; i < hdr->lgpl.palNumEntries; i++) + { hdr->lgpl.palPalEntry[i].peFlags = 0; + emfdc_add_palette_entry( emf, hdr->lgpl.palPalEntry + i ); + } hdr->emr.iType = EMR_CREATEPALETTE; hdr->emr.nSize = offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[hdr->lgpl.palNumEntries] ); @@ -2344,6 +2384,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) struct emf *emf = get_dc_emf( dc_attr ); UINT index; + HeapFree( GetProcessHeap(), 0, emf->palette ); HeapFree( GetProcessHeap(), 0, emf->emh ); for (index = 0; index < emf->handles_size; index++) if (emf->handles[index]) @@ -2465,6 +2506,9 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, emf->dc_brush = 0; emf->dc_pen = 0; emf->path = FALSE; + emf->palette_size = 0; + emf->palette_used = 0; + emf->palette = NULL; emf->emh->iType = EMR_HEADER; emf->emh->nSize = size; @@ -2533,10 +2577,11 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, */ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) { + UINT size, palette_size; HENHMETAFILE hmf; struct emf *emf; DC_ATTR *dc_attr; - EMREOF emr; + EMREOF *emr; HANDLE mapping = 0; TRACE("(%p)\n", hdc ); @@ -2544,18 +2589,26 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) if (!(dc_attr = get_dc_attr( hdc )) || !get_dc_emf( dc_attr )) return 0; emf = get_dc_emf( dc_attr ); + palette_size = emf->palette_used * sizeof(*emf->palette); + size = sizeof(*emr) + palette_size; + if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return 0; + if (dc_attr->save_level) RestoreDC( hdc, 1 ); if (emf->dc_brush) DeleteObject( emf->dc_brush ); if (emf->dc_pen) DeleteObject( emf->dc_pen ); - emr.emr.iType = EMR_EOF; - emr.emr.nSize = sizeof(emr); - emr.nPalEntries = 0; - emr.offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); - emr.nSizeLast = emr.emr.nSize; - emfdc_record( emf, &emr.emr ); + + emr->emr.iType = EMR_EOF; + emr->emr.nSize = size; + emr->nPalEntries = emf->palette_used; + emr->offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); + memcpy( (BYTE *)emr + emr->offPalEntries, emf->palette, palette_size ); + /* Set nSizeLast */ + ((DWORD *)((BYTE *)emr + size))[-1] = size; + emfdc_record( emf, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); emf->emh->rclBounds = dc_attr->emf_bounds;

1 0

Piotr Caban : gdi32: Fix EMR_CREATEPALETTE recording.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: b9b159e5a85a84fca2284c954fb7e7ba210a89c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9b159e5a85a84fca2284c954fb7e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:33:01 2023 +0200 gdi32: Fix EMR_CREATEPALETTE recording. --- dlls/gdi32/emfdc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index f3ee0e3611c..cc8e78a3cb5 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -651,27 +651,27 @@ static BOOL emfdc_select_pen( DC_ATTR *dc_attr, HPEN pen ) static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal ) { + BYTE data[offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[256] )]; + EMRCREATEPALETTE *hdr = (EMRCREATEPALETTE *)data; WORD i; - struct { - EMRCREATEPALETTE hdr; - PALETTEENTRY entry[255]; - } pal; - memset( &pal, 0, sizeof(pal) ); + memset( data, 0, sizeof(data) ); - if (!GetObjectW( hPal, sizeof(pal.hdr.lgpl) + sizeof(pal.entry), &pal.hdr.lgpl )) + hdr->lgpl.palVersion = 0x300; + hdr->lgpl.palNumEntries = GetPaletteEntries( hPal, 0, 256, hdr->lgpl.palPalEntry ); + if (!hdr->lgpl.palNumEntries) return 0; - for (i = 0; i < pal.hdr.lgpl.palNumEntries; i++) - pal.hdr.lgpl.palPalEntry[i].peFlags = 0; + for (i = 0; i < hdr->lgpl.palNumEntries; i++) + hdr->lgpl.palPalEntry[i].peFlags = 0; - pal.hdr.emr.iType = EMR_CREATEPALETTE; - pal.hdr.emr.nSize = sizeof(pal.hdr) + pal.hdr.lgpl.palNumEntries * sizeof(PALETTEENTRY); - pal.hdr.ihPal = emfdc_add_handle( emf, hPal ); + hdr->emr.iType = EMR_CREATEPALETTE; + hdr->emr.nSize = offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[hdr->lgpl.palNumEntries] ); + hdr->ihPal = emfdc_add_handle( emf, hPal ); - if (!emfdc_record( emf, &pal.hdr.emr )) - pal.hdr.ihPal = 0; - return pal.hdr.ihPal; + if (!emfdc_record( emf, &hdr->emr )) + hdr->ihPal = 0; + return hdr->ihPal; } BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette )

1 0

Piotr Caban : gdi32: Use EMR_REALIZEPALETTE to record RealizePalette.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: c752e84543e6c96a06eb8bd61aaad9891200addf URL: https://gitlab.winehq.org/wine/wine/-/commit/c752e84543e6c96a06eb8bd61aaad9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:31:41 2023 +0200 gdi32: Use EMR_REALIZEPALETTE to record RealizePalette. --- dlls/gdi32/dc.c | 4 ++++ dlls/gdi32/emfdc.c | 14 ++++++++++++++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 19 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 44dd9b9373d..8fa30884baf 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2153,7 +2153,11 @@ HPALETTE WINAPI SelectPalette( HDC hdc, HPALETTE palette, BOOL force_background */ UINT WINAPI RealizePalette( HDC hdc ) { + DC_ATTR *dc_attr; + if (is_meta_dc( hdc )) return METADC_RealizePalette( hdc ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_RealizePalette( dc_attr )) return 0; return pfnRealizePalette( hdc ); } diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index bf35450cfb3..f3ee0e3611c 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -696,6 +696,20 @@ BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ) return emfdc_record( emf, &emr.emr ); } +BOOL EMFDC_RealizePalette( DC_ATTR *dc_attr ) +{ + HPALETTE palette = GetCurrentObject( dc_attr_handle( dc_attr ), OBJ_PAL ); + struct emf *emf = get_dc_emf( dc_attr ); + EMRREALIZEPALETTE emr; + + if (palette == GetStockObject( DEFAULT_PALETTE )) + return TRUE; + + emr.emr.iType = EMR_REALIZEPALETTE; + emr.emr.nSize = sizeof(emr); + return emfdc_record( emf, &emr.emr ); +} + BOOL EMFDC_SelectObject( DC_ATTR *dc_attr, HGDIOBJ obj ) { switch (gdi_handle_type( obj )) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index da4c951eb00..4a9c70dcbc3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -225,6 +225,7 @@ extern BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *points, const INT extern BOOL EMFDC_Polygon( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Polyline( DC_ATTR *dc_attr, const POINT *points, INT count) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolylineTo( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_RealizePalette( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RestoreDC( DC_ATTR *dc_attr, INT level ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : wineps: Handle EMR_SETPALETTEENTRIES record in spool files.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 3fdff0b10651485715f02a799771f70966083a5f URL: https://gitlab.winehq.org/wine/wine/-/commit/3fdff0b10651485715f02a799771f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:27:23 2023 +0200 wineps: Handle EMR_SETPALETTEENTRIES record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f72a1a08b5b..0169873ceaf 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_SETPALETTEENTRIES: case EMR_RESIZEPALETTE: case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION:

1 0

Piotr Caban : wineps: Handle EMR_RESIZEPALETTE record in spool files.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: d1d7f1a5dce276d1b159cc835909ae51cd66d424 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d7f1a5dce276d1b159cc835909ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:26:58 2023 +0200 wineps: Handle EMR_RESIZEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 37053e8061f..f72a1a08b5b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_RESIZEPALETTE: case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE:

1 0

Piotr Caban : wineps: Handle EMR_REALIZEPALETTE record in spool files.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: d200b0fcf23b1d14e6eb866e0fdfec12ec172ba5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d200b0fcf23b1d14e6eb866e0fdfec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:26:31 2023 +0200 wineps: Handle EMR_REALIZEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 48f584e1a7e..37053e8061f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE: case EMR_FLATTENPATH:

1 0

Ziqing Hui : mfreadwrite: Fix an address of operator typo.
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: wine Branch: master Commit: d1c317720ab6a92811c013408844ffd9e581b2a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1c317720ab6a92811c013408844ff… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 19 16:23:32 2023 +0800 mfreadwrite: Fix an address of operator typo. --- dlls/mfreadwrite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index aaf972734c4..83b0442b20e 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -1070,7 +1070,7 @@ static HRESULT sink_writer_get_sink_factory_class(const WCHAR *url, IMFAttribute for (i = 0; i < ARRAY_SIZE(class_map); ++i) { - if (IsEqualGUID(&container, &class_map[i].container)) + if (IsEqualGUID(&container, class_map[i].container)) { *clsid = *class_map[i].clsid; return S_OK;

1 0

Zebediah Figura : vkd3d-shader/tpf: Return unsigned int from hlsl_sm4_register_from_semantic().
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: vkd3d Branch: master Commit: b46df551eba19ccf45ad907bef0e622367fef3da URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b46df551eba19ccf45ad907bef0e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 20 17:53:54 2023 -0500 vkd3d-shader/tpf: Return unsigned int from hlsl_sm4_register_from_semantic(). Fix a compile warning: ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c: In function 'allocate_semantic_register': ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c:2947:85: error: passing argument 4 of 'hlsl_sm4_register_from_semantic' from incompatible pointer type [-Werror=incompatible-pointer-types] 2947 | if ((builtin = hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, NULL, &has_idx))) | ^~~~~ | | | unsigned int * In file included from ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c:21: ../vkd3d/libs/vkd3d-shader/hlsl.h:1171:52: note: expected 'enum vkd3d_sm4_register_type *' but argument is of type 'unsigned int *' 1171 | bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/tpf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 86f35df2..974252d4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1168,7 +1168,7 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3D_NAME *usage); bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); + bool output, unsigned int *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 80487060..e76cf8c9 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2222,7 +2222,7 @@ static bool type_is_integer(const struct hlsl_type *type) } bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) + bool output, unsigned int *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) { unsigned int i;

1 0

Brendan Shanks : msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64.
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: wine Branch: master Commit: e414561a96156b028f73b0cf223ccf3dc9ad3587 URL: https://gitlab.winehq.org/wine/wine/-/commit/e414561a96156b028f73b0cf223ccf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 20 14:39:42 2023 -0700 msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64. --- dlls/msvcrt/except_x86_64.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d40b9985cd2..b07a7b83772 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -579,14 +579,14 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + if (rec->ExceptionCode == CXX_EXCEPTION && + (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])) + { + TRACE("rethrow detected.\n"); + *rec = *msvcrt_get_thread_data()->exc_record; + } if (rec->ExceptionCode == CXX_EXCEPTION) { - if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) - { - TRACE("rethrow detected.\n"); - *rec = *msvcrt_get_thread_data()->exc_record; - } - exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh))

1 0

Alexandre Julliard : winedump: Print entry point names in code range lists.
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: wine Branch: master Commit: 90cc094260ea987071f160d77168199c339008f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/90cc094260ea987071f160d7716819… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 16:34:13 2023 +0200 winedump: Print entry point names in code range lists. --- tools/winedump/pe.c | 80 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4e293fa32b5..fa9c5eedec5 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -647,6 +647,30 @@ static void dump_section_apiset(void) } } +static const char *find_export_from_rva( UINT rva ) +{ + UINT i, *func_names; + const UINT *funcs; + const UINT *names; + const WORD *ordinals; + 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; + 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) )); + + free( func_names ); + if (!ret && rva == PE_nt_headers->OptionalHeader.AddressOfEntryPoint) return "<EntryPoint>"; + return ret; +} + static void dump_dir_exported_functions(void) { unsigned int size; @@ -1833,26 +1857,26 @@ static void dump_hybrid_metadata(void) { const IMAGE_ARM64EC_METADATA *data = metadata; - printf( "Version %#x\n", (int)data->Version ); - printf( "CodeMap %#x\n", (int)data->CodeMap ); - printf( "CodeMapCount %#x\n", (int)data->CodeMapCount ); - printf( "CodeRangesToEntryPoints %#x\n", (int)data->CodeRangesToEntryPoints ); - printf( "RedirectionMetadata %#x\n", (int)data->RedirectionMetadata ); - printf( "__os_arm64x_dispatch_call_no_redirect %#x\n", (int)data->__os_arm64x_dispatch_call_no_redirect ); - printf( "__os_arm64x_dispatch_ret %#x\n", (int)data->__os_arm64x_dispatch_ret ); - printf( "__os_arm64x_dispatch_call %#x\n", (int)data->__os_arm64x_dispatch_call ); - printf( "__os_arm64x_dispatch_icall %#x\n", (int)data->__os_arm64x_dispatch_icall ); - printf( "__os_arm64x_dispatch_icall_cfg %#x\n", (int)data->__os_arm64x_dispatch_icall_cfg ); - printf( "AlternateEntryPoint %#x\n", (int)data->AlternateEntryPoint ); - printf( "AuxiliaryIAT %#x\n", (int)data->AuxiliaryIAT ); - printf( "CodeRangesToEntryPointsCount %#x\n", (int)data->CodeRangesToEntryPointsCount ); - printf( "RedirectionMetadataCount %#x\n", (int)data->RedirectionMetadataCount ); - printf( "GetX64InformationFunctionPointer %#x\n", (int)data->GetX64InformationFunctionPointer ); - printf( "SetX64InformationFunctionPointer %#x\n", (int)data->SetX64InformationFunctionPointer ); - printf( "ExtraRFETable %#x\n", (int)data->ExtraRFETable ); - printf( "ExtraRFETableSize %#x\n", (int)data->ExtraRFETableSize ); - printf( "__os_arm64x_dispatch_fptr %#x\n", (int)data->__os_arm64x_dispatch_fptr ); - printf( "AuxiliaryIATCopy %#x\n", (int)data->AuxiliaryIATCopy ); + printf( " Version %#x\n", (int)data->Version ); + printf( " CodeMap %#x\n", (int)data->CodeMap ); + printf( " CodeMapCount %#x\n", (int)data->CodeMapCount ); + printf( " CodeRangesToEntryPoints %#x\n", (int)data->CodeRangesToEntryPoints ); + printf( " RedirectionMetadata %#x\n", (int)data->RedirectionMetadata ); + printf( " __os_arm64x_dispatch_call_no_redirect %#x\n", (int)data->__os_arm64x_dispatch_call_no_redirect ); + printf( " __os_arm64x_dispatch_ret %#x\n", (int)data->__os_arm64x_dispatch_ret ); + printf( " __os_arm64x_dispatch_call %#x\n", (int)data->__os_arm64x_dispatch_call ); + printf( " __os_arm64x_dispatch_icall %#x\n", (int)data->__os_arm64x_dispatch_icall ); + printf( " __os_arm64x_dispatch_icall_cfg %#x\n", (int)data->__os_arm64x_dispatch_icall_cfg ); + printf( " AlternateEntryPoint %#x\n", (int)data->AlternateEntryPoint ); + printf( " AuxiliaryIAT %#x\n", (int)data->AuxiliaryIAT ); + printf( " CodeRangesToEntryPointsCount %#x\n", (int)data->CodeRangesToEntryPointsCount ); + printf( " RedirectionMetadataCount %#x\n", (int)data->RedirectionMetadataCount ); + printf( " GetX64InformationFunctionPointer %#x\n", (int)data->GetX64InformationFunctionPointer ); + printf( " SetX64InformationFunctionPointer %#x\n", (int)data->SetX64InformationFunctionPointer ); + printf( " ExtraRFETable %#x\n", (int)data->ExtraRFETable ); + printf( " ExtraRFETableSize %#x\n", (int)data->ExtraRFETableSize ); + printf( " __os_arm64x_dispatch_fptr %#x\n", (int)data->__os_arm64x_dispatch_fptr ); + printf( " AuxiliaryIATCopy %#x\n", (int)data->AuxiliaryIATCopy ); if (data->CodeMap) { @@ -1868,6 +1892,8 @@ static void dump_hybrid_metadata(void) } } + if (PE_nt_headers->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64) break; + if (data->CodeRangesToEntryPoints) { const IMAGE_ARM64EC_CODE_RANGE_ENTRY_POINT *map = RVA( data->CodeRangesToEntryPoints, @@ -1876,8 +1902,13 @@ static void dump_hybrid_metadata(void) printf( "\nCode ranges to entry points\n" ); printf( " Start - End Entry point\n" ); for (i = 0; i < data->CodeRangesToEntryPointsCount; i++) - printf( " %08x - %08x %08x\n", + { + 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" ); + } } if (data->RedirectionMetadata) @@ -1887,7 +1918,12 @@ static void dump_hybrid_metadata(void) printf( "\nEntry point redirection\n" ); for (i = 0; i < data->RedirectionMetadataCount; i++) - printf( " %08x -> %08x\n", (int)map[i].Source, (int)map[i].Destination ); + { + 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" ); + } } break; }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2023