- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Ignore end_c when processing ARM64 unwind codes.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 1abebca6dc024505a72bd564c6e998107102c1c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1abebca6dc024505a72bd564c6e998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 16:29:03 2024 +0100 ntdll: Ignore end_c when processing ARM64 unwind codes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55584 --- dlls/ntdll/tests/exception.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unwind.c | 4 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 789a954cbe0..518b15f7821 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8952,6 +8952,46 @@ static void test_virtual_unwind(void) { 0x1c, 0xa0, 0, 0xa8, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {d10, 0x40}, {d11, 0x50}, {d12, 0x60}, {d13, 0x70}, {d14, 0x80}, {d15, 0x90}, {lr, 0xa8}, {x29, 0xa0}, {-1,-1} }}, }; + static const BYTE function_15[] = + { + 0x1f, 0x20, 0x03, 0xd5, /* 00: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 04: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 08: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 10: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 14: ret */ + }; + + static const DWORD unwind_info_15_header = + (sizeof(function_15)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (2 << 27); /* codes */ + + static const BYTE unwind_info_15[] = + { + DW(unwind_info_15_header), + UWOP_END_C, + UWOP_SET_FP, /* mov x29, sp */ + UWOP_SAVE_REGP(19, 0x10), /* stp r19, r20, [sp, #0x10] */ + UWOP_SAVE_FPLR_X(0x20), /* stp r29, lr, [sp,-#0x20]! */ + UWOP_END, + UWOP_NOP, /* padding */ + UWOP_NOP, /* padding */ + }; + + static const struct results results_15[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x04, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x08, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x0c, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x10, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x14, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { #define TEST(func, unwind, unwind_packed, results) \ @@ -8971,6 +9011,7 @@ static void test_virtual_unwind(void) TEST(function_12, unwind_info_12, 1, results_12), TEST(function_13, unwind_info_13, 1, results_13), TEST(function_14, unwind_info_14, 0, results_14), + TEST(function_15, unwind_info_15, 0, results_15), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 4cc304b63ef..270410adf82 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -392,7 +392,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex /* skip codes */ while (ptr < end && skip) { - if (*ptr == 0xe4 || *ptr == 0xe5) break; + if (*ptr == 0xe4) break; ptr += unwind_code_len[*ptr]; skip--; } @@ -448,7 +448,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex else if (*ptr == 0xe4) /* end */ break; else if (*ptr == 0xe5) /* end_c */ - break; + /* ignore */; else if (*ptr == 0xe6) /* save_next */ { save_next += 2;

1 0

Jinoh Kang : ntdll: Remove stale comment from set_async_direct_result() documentation.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: b74e1a570b40220803a31700558e523ead383638 URL: https://gitlab.winehq.org/wine/wine/-/commit/b74e1a570b40220803a31700558e52… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Feb 9 21:54:00 2024 +0900 ntdll: Remove stale comment from set_async_direct_result() documentation. The supplied async handle passed to set_async_direct_result() cannot be NULL. --- dlls/ntdll/unix/sync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1df2ea6e9d2..cde6a0f8483 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2593,7 +2593,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif /* Notify direct completion of async and close the wait handle if it is no longer needed. - * This function is a no-op (returns status as-is) if the supplied handle is NULL. */ void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) {

1 0

Paul Gofman : strmbase: Force debug info in critical sections.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: fb64ea8675dc1ab4cc4e89a9924f3672a6662136 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb64ea8675dc1ab4cc4e89a9924f36… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 13 18:33:08 2024 -0600 strmbase: Force debug info in critical sections. --- libs/strmbase/filter.c | 4 ++-- libs/strmbase/pospass.c | 2 +- libs/strmbase/seeking.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index ee41611a198..fa8738188a2 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -524,10 +524,10 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->outer_unk = outer ? outer : &filter->IUnknown_inner; filter->refcount = 1; - InitializeCriticalSection(&filter->filter_cs); + InitializeCriticalSectionEx(&filter->filter_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs"); - InitializeCriticalSection(&filter->stream_cs); + InitializeCriticalSectionEx(&filter->stream_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.stream_cs"); filter->clsid = *clsid; diff --git a/libs/strmbase/pospass.c b/libs/strmbase/pospass.c index 03cb7783f97..79ebf44cf24 100644 --- a/libs/strmbase/pospass.c +++ b/libs/strmbase/pospass.c @@ -730,7 +730,7 @@ void strmbase_passthrough_init(struct strmbase_passthrough *passthrough, IUnknow passthrough->IMediaPosition_iface.lpVtbl = &IMediaPositionPassThru_Vtbl; passthrough->IMediaSeeking_iface.lpVtbl = &IMediaSeekingPassThru_Vtbl; passthrough->ISeekingPassThru_iface.lpVtbl = &ISeekingPassThru_Vtbl; - InitializeCriticalSection(&passthrough->time_cs); + InitializeCriticalSectionEx(&passthrough->time_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); passthrough->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_passthrough.time_cs" ); } diff --git a/libs/strmbase/seeking.c b/libs/strmbase/seeking.c index 91e9ccedfb4..574083b985f 100644 --- a/libs/strmbase/seeking.c +++ b/libs/strmbase/seeking.c @@ -49,7 +49,7 @@ HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl * pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; - InitializeCriticalSection(&pSeeking->cs); + InitializeCriticalSectionEx(&pSeeking->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs"); return S_OK; }

1 0

Alexandre Julliard : winedump: Add dumping of the save_any_reg ARM64 unwind code.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 7c4ca6ff74248b0dfd54be206e6a0e7b13c6ba8a URL: https://gitlab.winehq.org/wine/wine/-/commit/7c4ca6ff74248b0dfd54be206e6a0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 15:08:55 2024 +0100 winedump: Add dumping of the save_any_reg ARM64 unwind code. --- tools/winedump/pe.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f405acb2710..1879dd0ce2a 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1395,7 +1395,7 @@ static const BYTE code_lengths[256] = /* 80 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* a0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* c0 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, -/* e0 */ 4,1,2,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +/* e0 */ 4,1,2,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 }; static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) @@ -1406,8 +1406,7 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) { BYTE len = code_lengths[ptr[i]]; unsigned int val = ptr[i]; - if (len == 2) val = ptr[i] * 0x100 + ptr[i+1]; - else if (len == 4) val = ptr[i] * 0x1000000 + ptr[i+1] * 0x10000 + ptr[i+2] * 0x100 + ptr[i+3]; + for (j = 1; j < len; j++) val = val * 0x100 + ptr[i + j]; printf( " %04x: ", i ); for (j = 0; j < 4; j++) @@ -1507,21 +1506,18 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) { printf( "save_next\n" ); } - else if (ptr[i] == 0xe7) /* arithmetic */ + else if (ptr[i] == 0xe7) /* save_any_reg */ { - switch ((val >> 4) & 0x0f) - { - case 0: printf( "add lr,lr,x28\n" ); break; - case 1: printf( "add lr,lr,sp\n" ); break; - case 2: printf( "sub lr,lr,x28\n" ); break; - case 3: printf( "sub lr,lr,sp\n" ); break; - case 4: printf( "eor lr,lr,x28\n" ); break; - case 5: printf( "eor lr,lr,sp\n" ); break; - case 6: printf( "rol lr,lr,neg x28\n" ); break; - case 8: printf( "ror lr,lr,x28\n" ); break; - case 9: printf( "ror lr,lr,sp\n" ); break; - default:printf( "unknown op\n" ); break; - } + char reg = "xdq?"[(val >> 6) & 3]; + int num = (val >> 8) & 0x1f; + if (val & 0x4000) + printf( "stp %c%u,%c%u", reg, num, reg, num + 1 ); + else + printf( "str %c%u,", reg, num ); + if (val & 0x2000) + printf( "[sp,#-%#x]!\n", 16 * (val & 0x3f) + 16 ); + else + printf( "[sp,#%#x]\n", (val & 0x3f) * ((val & 0x4080) ? 16 : 8) ); } else if (ptr[i] == 0xe8) /* MSFT_OP_TRAP_FRAME */ {

1 0

Paul Gofman : dmime: Force debug info in critical sections.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: bbe1c7532a807844fbc4d1523fed88938f56f3a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbe1c7532a807844fbc4d1523fed88… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 13 18:41:12 2024 -0600 dmime: Force debug info in critical sections. --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 08d74a81c25..500bc8b536f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -2291,7 +2291,7 @@ HRESULT create_dmperformance(REFIID iid, void **ret_iface) obj->ref = 1; obj->pDefaultPath = NULL; - InitializeCriticalSection(&obj->safe); + InitializeCriticalSectionEx(&obj->safe, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": performance->safe"); wine_rb_init(&obj->channel_blocks, channel_block_compare);

1 0

Paul Gofman : dmsynth: Force debug info in critical sections.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 17f94ab56389d355571305aa981471b7110b1e42 URL: https://gitlab.winehq.org/wine/wine/-/commit/17f94ab56389d355571305aa981471… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 13 18:42:39 2024 -0600 dmsynth: Force debug info in critical sections. --- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 5453c296be3..ecf1dead8a8 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1992,7 +1992,7 @@ HRESULT synth_create(IUnknown **ret_iface) goto failed; fluid_sfont_set_data(obj->fluid_sfont, obj); - InitializeCriticalSection(&obj->cs); + InitializeCriticalSectionEx(&obj->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); obj->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); TRACE("Created DirectMusicSynth %p\n", obj); diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 9263ff56349..c0ac7871f9a 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -754,7 +754,7 @@ HRESULT synth_sink_create(IUnknown **ret_iface) obj->ref = 1; obj->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); - InitializeCriticalSection(&obj->cs); + InitializeCriticalSectionEx(&obj->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); obj->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); TRACE("Created DirectMusicSynthSink %p\n", obj);

1 0

Jacek Caban : winebuild: Use exports struct in assign_names.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 3c9ede8abcb77937dbcf1e65eab53c9d12cd6dd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c9ede8abcb77937dbcf1e65eab53c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 14 15:05:15 2024 +0100 winebuild: Use exports struct in assign_names. --- tools/winebuild/build.h | 2 -- tools/winebuild/parser.c | 37 +++++++++++++++++-------------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 281c450ea9a..50559e7c98c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -153,7 +153,6 @@ typedef struct int heap_size; /* exe heap size */ int nb_entry_points; /* number of used entry points */ int alloc_entry_points; /* number of allocated entry points */ - int nb_names; /* number of entry points with names */ unsigned int nb_resources; /* number of resources */ int characteristics; /* characteristics for the PE header */ int dll_characteristics;/* DLL characteristics for the PE header */ @@ -162,7 +161,6 @@ typedef struct int subsystem_minor; /* subsystem version minor number */ int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* spec entry points */ - ORDDEF **names; /* array of entry point names (points into entry_points) */ struct exports exports; /* dll exports */ struct resource *resources; /* array of dll resources (format differs between Win16/Win32) */ struct apiset apiset; /* list of defined api sets */ diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index c8b970ea59f..a8e5eb1d09b 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -843,24 +843,24 @@ static int name_compare( const void *ptr1, const void *ptr2 ) * * Build the name array and catch duplicates. */ -static void assign_names( DLLSPEC *spec ) +static void assign_names( struct exports *exports ) { int i, j, nb_exp_names = 0; ORDDEF **all_names; - spec->nb_names = 0; - for (i = 0; i < spec->nb_entry_points; i++) - if (spec->entry_points[i].name) spec->nb_names++; - else if (spec->entry_points[i].export_name) nb_exp_names++; + exports->nb_names = 0; + for (i = 0; i < exports->nb_entry_points; i++) + if (exports->entry_points[i]->name) exports->nb_names++; + else if (exports->entry_points[i]->export_name) nb_exp_names++; - if (!spec->nb_names && !nb_exp_names) return; + if (!exports->nb_names && !nb_exp_names) return; /* check for duplicates */ - all_names = xmalloc( (spec->nb_names + nb_exp_names) * sizeof(all_names[0]) ); - for (i = j = 0; i < spec->nb_entry_points; i++) - if (spec->entry_points[i].name || spec->entry_points[i].export_name) - all_names[j++] = &spec->entry_points[i]; + all_names = xmalloc( (exports->nb_names + nb_exp_names) * sizeof(all_names[0]) ); + for (i = j = 0; i < exports->nb_entry_points; i++) + if (exports->entry_points[i]->name || exports->entry_points[i]->export_name) + all_names[j++] = exports->entry_points[i]; qsort( all_names, j, sizeof(all_names[0]), name_compare ); @@ -879,15 +879,15 @@ static void assign_names( DLLSPEC *spec ) } free( all_names ); - if (spec->nb_names) + if (exports->nb_names) { - spec->names = xmalloc( spec->nb_names * sizeof(spec->names[0]) ); - for (i = j = 0; i < spec->nb_entry_points; i++) - if (spec->entry_points[i].name) spec->names[j++] = &spec->entry_points[i]; + exports->names = xmalloc( exports->nb_names * sizeof(exports->names[0]) ); + for (i = j = 0; i < exports->nb_entry_points; i++) + if (exports->entry_points[i]->name) exports->names[j++] = exports->entry_points[i]; /* sort the list of names */ - qsort( spec->names, spec->nb_names, sizeof(spec->names[0]), name_compare ); - for (i = 0; i < spec->nb_names; i++) spec->names[i]->hint = i; + qsort( exports->names, exports->nb_names, sizeof(exports->names[0]), name_compare ); + for (i = 0; i < exports->nb_names; i++) exports->names[i]->hint = i; } } @@ -962,11 +962,8 @@ static void assign_exports( DLLSPEC *spec ) exports->entry_points[exports->nb_entry_points++] = entry; } - assign_names( spec ); + assign_names( exports ); assign_ordinals( exports ); - - exports->nb_names = spec->nb_names; - exports->names = spec->names; }

1 0

Jacek Caban : winebuild: Use exports struct in assign_ordinals.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 1bc06138f4b2978c023c8dd88fd54f311bd8f5bc URL: https://gitlab.winehq.org/wine/wine/-/commit/1bc06138f4b2978c023c8dd88fd54f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 14 14:53:14 2024 +0100 winebuild: Use exports struct in assign_ordinals. --- tools/winebuild/build.h | 3 --- tools/winebuild/parser.c | 61 ++++++++++++++++++++++-------------------------- tools/winebuild/utils.c | 1 - 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index ec463792eef..281c450ea9a 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -149,8 +149,6 @@ typedef struct char *init_func; /* initialization routine */ char *main_module; /* main Win32 module for Win16 specs */ SPEC_TYPE type; /* type of dll (Win16/Win32) */ - int base; /* ordinal base */ - int limit; /* ordinal limit */ int stack_size; /* exe stack size */ int heap_size; /* exe heap size */ int nb_entry_points; /* number of used entry points */ @@ -165,7 +163,6 @@ typedef struct int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* spec entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ - ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ struct exports exports; /* dll exports */ struct resource *resources; /* array of dll resources (format differs between Win16/Win32) */ struct apiset apiset; /* list of defined api sets */ diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 01c230a0a2c..c8b970ea59f 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -648,8 +648,6 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) error( "Ordinal number %d too large\n", ordinal ); goto error; } - if (ordinal > spec->limit) spec->limit = ordinal; - if (ordinal < spec->base) spec->base = ordinal; odp->ordinal = ordinal; } @@ -898,57 +896,57 @@ static void assign_names( DLLSPEC *spec ) * * Build the ordinal array. */ -static void assign_ordinals( DLLSPEC *spec ) +static void assign_ordinals( struct exports *exports ) { int i, count, ordinal; /* start assigning from base, or from 1 if no ordinal defined yet */ - spec->base = MAX_ORDINALS; - spec->limit = 0; - for (i = 0; i < spec->nb_entry_points; i++) + exports->base = MAX_ORDINALS; + exports->limit = 0; + for (i = 0; i < exports->nb_entry_points; i++) { - ordinal = spec->entry_points[i].ordinal; + ordinal = exports->entry_points[i]->ordinal; if (ordinal == -1) continue; - if (ordinal > spec->limit) spec->limit = ordinal; - if (ordinal < spec->base) spec->base = ordinal; + if (ordinal > exports->limit) exports->limit = ordinal; + if (ordinal < exports->base) exports->base = ordinal; } - if (spec->base == MAX_ORDINALS) spec->base = 1; - if (spec->limit < spec->base) spec->limit = spec->base; + if (exports->base == MAX_ORDINALS) exports->base = 1; + if (exports->limit < exports->base) exports->limit = exports->base; - count = max( spec->limit + 1, spec->base + spec->nb_entry_points ); - spec->ordinals = xmalloc( count * sizeof(spec->ordinals[0]) ); - memset( spec->ordinals, 0, count * sizeof(spec->ordinals[0]) ); + count = max( exports->limit + 1, exports->base + exports->nb_entry_points ); + exports->ordinals = xmalloc( count * sizeof(exports->ordinals[0]) ); + memset( exports->ordinals, 0, count * sizeof(exports->ordinals[0]) ); /* fill in all explicitly specified ordinals */ - for (i = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < exports->nb_entry_points; i++) { - ordinal = spec->entry_points[i].ordinal; + ordinal = exports->entry_points[i]->ordinal; if (ordinal == -1) continue; - if (spec->ordinals[ordinal]) + if (exports->ordinals[ordinal]) { - current_line = max( spec->entry_points[i].lineno, spec->ordinals[ordinal]->lineno ); + current_line = max( exports->entry_points[i]->lineno, exports->ordinals[ordinal]->lineno ); error( "ordinal %d redefined\n%s:%d: First defined here\n", ordinal, input_file_name, - min( spec->entry_points[i].lineno, spec->ordinals[ordinal]->lineno ) ); + min( exports->entry_points[i]->lineno, exports->ordinals[ordinal]->lineno ) ); } - else spec->ordinals[ordinal] = &spec->entry_points[i]; + else exports->ordinals[ordinal] = exports->entry_points[i]; } /* now assign ordinals to the rest */ - for (i = 0, ordinal = spec->base; i < spec->nb_entry_points; i++) + for (i = 0, ordinal = exports->base; i < exports->nb_entry_points; i++) { - if (spec->entry_points[i].ordinal != -1) continue; - while (spec->ordinals[ordinal]) ordinal++; + if (exports->entry_points[i]->ordinal != -1) continue; + while (exports->ordinals[ordinal]) ordinal++; if (ordinal >= MAX_ORDINALS) { - current_line = spec->entry_points[i].lineno; + current_line = exports->entry_points[i]->lineno; fatal_error( "Too many functions defined (max %d)\n", MAX_ORDINALS ); } - spec->entry_points[i].ordinal = ordinal; - spec->ordinals[ordinal] = &spec->entry_points[i]; + exports->entry_points[i]->ordinal = ordinal; + exports->ordinals[ordinal] = exports->entry_points[i]; } - if (ordinal > spec->limit) spec->limit = ordinal; + if (ordinal > exports->limit) exports->limit = ordinal; } @@ -965,13 +963,10 @@ static void assign_exports( DLLSPEC *spec ) } assign_names( spec ); - assign_ordinals( spec ); + assign_ordinals( exports ); exports->nb_names = spec->nb_names; exports->names = spec->names; - exports->base = spec->base; - exports->limit = spec->limit; - exports->ordinals = spec->ordinals; } @@ -1012,9 +1007,9 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) /* add the explicit win32 exports */ - for (i = 1; i <= spec16->limit; i++) + for (i = 1; i <= spec16->exports.limit; i++) { - ORDDEF *odp16 = spec16->ordinals[i]; + ORDDEF *odp16 = spec16->exports.ordinals[i]; if (!odp16 || !odp16->name) continue; if (!(odp16->flags & FLAG_EXPORT32)) continue; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 337db77bcaf..258a644b494 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -609,7 +609,6 @@ DLLSPEC *alloc_dll_spec(void) spec = xmalloc( sizeof(*spec) ); memset( spec, 0, sizeof(*spec) ); spec->type = SPEC_WIN32; - spec->base = MAX_ORDINALS; spec->characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; spec->subsystem_major = 4;

1 0

Jacek Caban : winebuild: Use exports struct for exports handling.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: f5ed0de39275e18e7b27e3063b5443e14b1d0818 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5ed0de39275e18e7b27e3063b5443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 14 01:26:03 2024 +0100 winebuild: Use exports struct for exports handling. --- tools/winebuild/spec32.c | 126 ++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 61 deletions(-)

1 0

Jacek Caban : winebuild: Move target filtering to assign_exports.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 3f421410c1ffc41128afc437bab925be7c1fb42d URL: https://gitlab.winehq.org/wine/wine/-/commit/3f421410c1ffc41128afc437bab925… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 14 15:08:25 2024 +0100 winebuild: Move target filtering to assign_exports. --- tools/winebuild/parser.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index a8e5eb1d09b..5bd05e97ca9 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -623,13 +623,6 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) assert( 0 ); } - if ((odp->flags & FLAG_CPU_MASK) && !(odp->flags & FLAG_CPU(target.cpu))) - { - /* ignore this entry point */ - spec->nb_entry_points--; - return 1; - } - if (data_only && !(odp->flags & FLAG_FORWARD)) { error( "Only forwarded entry points are allowed in data-only mode\n" ); @@ -959,6 +952,8 @@ static void assign_exports( DLLSPEC *spec ) for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *entry = &spec->entry_points[i]; + if ((entry->flags & FLAG_CPU_MASK) && !(entry->flags & FLAG_CPU(target.cpu))) + continue; exports->entry_points[exports->nb_entry_points++] = entry; }

1 0