February 2024 - Wine-commits

Daniel Lehman : oleaut32/tests: Add tests for number of digits.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 55e4aa7a3126e92a7d9bca6e2fb4ad23debc61a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/55e4aa7a3126e92a7d9bca6e2fb4ad… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Feb 4 08:26:00 2024 -0800 oleaut32/tests: Add tests for number of digits. --- dlls/oleaut32/tests/vartype.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c6772a7be14..e58e840a6a9 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4549,10 +4549,12 @@ static void test_VarBstrFromR4(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1.234E+16" }, + { 3.14159300, L"3.141593" }, + { 3.14159265, L"3.141593" }, { M_PI, L"3.141593" }, - { 37.86626157, L"37.86626" }, - { 137.86626157, L"137.8663" }, - { 1137.86626157, L"1137.866" }, + { 12.34567890, L"12.34568" }, + { 123.45678901, L"123.4568" }, + { 1234.56789012, L"1234.568" }, { 0.0, NULL } }; @@ -4575,7 +4577,12 @@ static void test_VarBstrFromR4(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1,234E+16" }, + { 3.14159300, L"3,141593" }, + { 3.14159265, L"3,141593" }, { M_PI, L"3,141593" }, + { 12.34567890, L"12,34568" }, + { 123.45678901, L"123,4568" }, + { 1234.56789012, L"1234,568" }, { 0.0, NULL } }; @@ -4693,6 +4700,12 @@ static void test_VarBstrFromR8(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1.234E+16" }, + { 3.141592653590000, L"3.14159265359" }, + { 3.141592653589793, L"3.14159265358979" }, + { M_PI, L"3.14159265358979" }, + { 12.345678901234567, L"12.3456789012346" }, + { 123.456789012345678, L"123.456789012346" }, + { 1234.567890123456789, L"1234.56789012346" }, { 0.0, NULL } }; @@ -4715,6 +4728,12 @@ static void test_VarBstrFromR8(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1,234E+16" }, + { 3.141592653590000, L"3,14159265359" }, + { 3.141592653589793, L"3,14159265358979" }, + { M_PI, L"3,14159265358979" }, + { 12.345678901234567, L"12,3456789012346" }, + { 123.456789012345678, L"123,456789012346" }, + { 1234.567890123456789, L"1234,56789012346" }, { 0.0, NULL } };

1 0

Daniel Lehman : oleaut32: Use scientific notation only for larger numbers in VarBstrFromR[48].
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 4d1ad4f9753b417e9260f614f57eaf0ce0cd5439 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d1ad4f9753b417e9260f614f57eaf… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Feb 6 22:48:35 2024 -0800 oleaut32: Use scientific notation only for larger numbers in VarBstrFromR[48]. --- dlls/oleaut32/tests/vartype.c | 22 ++++++++-------------- dlls/oleaut32/vartype.c | 18 +++++++++++++----- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e58e840a6a9..795446d0987 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4525,7 +4525,6 @@ struct r4_test { float val; const wchar_t *expect; - BOOL todo; }; static void test_VarBstrFromR4(void) @@ -4536,8 +4535,8 @@ static void test_VarBstrFromR4(void) { 0.05, L"0.05" }, { 0.005, L"0.005" }, { 0.0005, L"0.0005" }, - { 0.00005, L"0.00005", TRUE }, - { 0.000005, L"0.000005", TRUE }, + { 0.00005, L"0.00005" }, + { 0.000005, L"0.000005" }, { 1.0e8, L"1E+08" }, { 1.0e12, L"1E+12" }, @@ -4564,8 +4563,8 @@ static void test_VarBstrFromR4(void) { 0.05, L"0,05" }, { 0.005, L"0,005" }, { 0.0005, L"0,0005" }, - { 0.00005, L"0,00005", TRUE }, - { 0.000005, L"0,000005", TRUE }, + { 0.00005, L"0,00005" }, + { 0.000005, L"0,000005" }, { 1.0e8, L"1E+08" }, { 1.0e12, L"1E+12" }, @@ -4648,7 +4647,6 @@ static void test_VarBstrFromR4(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } @@ -4664,7 +4662,6 @@ static void test_VarBstrFromR4(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } @@ -4676,7 +4673,6 @@ struct r8_test { double val; const wchar_t *expect; - BOOL todo; }; static void test_VarBstrFromR8(void) @@ -4687,8 +4683,8 @@ static void test_VarBstrFromR8(void) { 0.05, L"0.05" }, { 0.005, L"0.005" }, { 0.0005, L"0.0005" }, - { 0.00005, L"0.00005", TRUE }, - { 0.000005, L"0.000005", TRUE }, + { 0.00005, L"0.00005" }, + { 0.000005, L"0.000005" }, { 1.0e8, L"100000000" }, { 1.0e12, L"1000000000000" }, @@ -4715,8 +4711,8 @@ static void test_VarBstrFromR8(void) { 0.05, L"0,05" }, { 0.005, L"0,005" }, { 0.0005, L"0,0005" }, - { 0.00005, L"0,00005", TRUE }, - { 0.000005, L"0,000005", TRUE }, + { 0.00005, L"0,00005" }, + { 0.000005, L"0,000005" }, { 1.0e8, L"100000000" }, { 1.0e12, L"1000000000000" }, @@ -4751,7 +4747,6 @@ static void test_VarBstrFromR8(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } @@ -4767,7 +4762,6 @@ static void test_VarBstrFromR8(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3ab404f33f8..d11fb41d1b3 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6538,16 +6538,24 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl } static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, - BSTR* pbstrOut, LPCWSTR lpszFormat) + BSTR* pbstrOut, int ndigits) { _locale_t locale; - WCHAR buff[256]; + WCHAR *e, buff[256]; + int len; if (!pbstrOut) return E_INVALIDARG; if (!(locale = _create_locale(LC_ALL, "C"))) return E_OUTOFMEMORY; - _swprintf_l(buff, ARRAY_SIZE(buff), lpszFormat, locale, dblIn); + len = _swprintf_l(buff, ARRAY_SIZE(buff), L"%.*G", locale, ndigits, dblIn); + e = wcschr(buff, 'E'); + if (e && labs(wcstol(e+1, NULL, 10)) < ndigits) + { + len = _swprintf_l(buff, ARRAY_SIZE(buff), L"%.*f", locale, ndigits, dblIn); + while (len > 0 && (buff[len-1] == '0')) len--; + } + buff[len] = 0; _free_locale(locale); /* Negative zeroes are disallowed (some applications depend on this). @@ -6598,7 +6606,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, L"%.7G"); + return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, 7); } /****************************************************************************** @@ -6619,7 +6627,7 @@ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO */ HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, L"%.15G"); + return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, 15); } /******************************************************************************

1 0

Jacek Caban : winebuild: Use exports struct for exports handling.
by Alexandre Julliard 15 Feb '24

15 Feb '24

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: Use exports struct in assign_ordinals.
by Alexandre Julliard 15 Feb '24

15 Feb '24

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 in assign_names.
by Alexandre Julliard 15 Feb '24

15 Feb '24

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: Move target filtering to assign_exports.
by Alexandre Julliard 15 Feb '24

15 Feb '24

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

Jacek Caban : winebuild: Introduce exports struct.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 73f0bbc7314f0b262e2d415113b930fc420779a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/73f0bbc7314f0b262e2d415113b930… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 14 00:59:26 2024 +0100 winebuild: Introduce exports struct. --- tools/winebuild/build.h | 14 +++++++++++++- tools/winebuild/parser.c | 32 ++++++++++++++++++++++++++------ tools/winebuild/utils.c | 12 ++++++++++-- 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e4ad4e6556f..ec463792eef 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -129,6 +129,17 @@ struct apiset static const unsigned int apiset_hash_factor = 31; +struct exports +{ + int nb_entry_points; /* number of used entry points */ + ORDDEF **entry_points; /* dll entry points */ + int nb_names; /* number of entry points with names */ + ORDDEF **names; /* array of entry point names (points into entry_points) */ + int base; /* ordinal base */ + int limit; /* ordinal limit */ + ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ +}; + typedef struct { char *src_name; /* file name of the source spec file */ @@ -152,9 +163,10 @@ typedef struct int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ int unicode_app; /* default to unicode entry point */ - ORDDEF *entry_points; /* dll entry points */ + 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 */ } DLLSPEC; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 959170e39b8..01c230a0a2c 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -952,6 +952,29 @@ static void assign_ordinals( DLLSPEC *spec ) } +static void assign_exports( DLLSPEC *spec ) +{ + struct exports *exports = &spec->exports; + unsigned int i; + + exports->entry_points = xmalloc( spec->nb_entry_points * sizeof(*exports->entry_points) ); + for (i = 0; i < spec->nb_entry_points; i++) + { + ORDDEF *entry = &spec->entry_points[i]; + exports->entry_points[exports->nb_entry_points++] = entry; + } + + assign_names( spec ); + assign_ordinals( spec ); + + exports->nb_names = spec->nb_names; + exports->names = spec->names; + exports->base = spec->base; + exports->limit = spec->limit; + exports->ordinals = spec->ordinals; +} + + /******************************************************************* * add_16bit_exports * @@ -1008,8 +1031,7 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) odp->u.func.nb_args * sizeof(odp->u.func.args[0]) ); } - assign_names( spec32 ); - assign_ordinals( spec32 ); + assign_exports( spec32 ); } @@ -1052,8 +1074,7 @@ int parse_spec_file( FILE *file, DLLSPEC *spec ) } current_line = 0; /* no longer parsing the input file */ - assign_names( spec ); - assign_ordinals( spec ); + assign_exports( spec ); return !nb_errors; } @@ -1295,7 +1316,6 @@ int parse_def_file( FILE *file, DLLSPEC *spec ) } current_line = 0; /* no longer parsing the input file */ - assign_names( spec ); - assign_ordinals( spec ); + assign_exports( spec ); return !nb_errors; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 2334611fa0d..337db77bcaf 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -615,10 +615,19 @@ DLLSPEC *alloc_dll_spec(void) spec->subsystem_major = 4; spec->subsystem_minor = 0; spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT | IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; + spec->exports.base = MAX_ORDINALS; return spec; } +static void free_exports( struct exports *entries ) +{ + free( entries->entry_points ); + free( entries->names ); + free( entries->ordinals ); +} + + /******************************************************************* * free_dll_spec * @@ -635,13 +644,12 @@ void free_dll_spec( DLLSPEC *spec ) free( odp->export_name ); free( odp->link_name ); } + free_exports( &spec->exports ); free( spec->file_name ); free( spec->dll_name ); free( spec->c_name ); free( spec->init_func ); free( spec->entry_points ); - free( spec->names ); - free( spec->ordinals ); free( spec->resources ); free( spec ); }

1 0

Jacek Caban : winebuild: Use exports struct for imports handling.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 499c6be73436ce0f35d82afede5aed3dc8781172 URL: https://gitlab.winehq.org/wine/wine/-/commit/499c6be73436ce0f35d82afede5aed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 14 01:12:22 2024 +0100 winebuild: Use exports struct for imports handling. --- tools/winebuild/import.c | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bc43c24ac13..a2473efc5ba 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -353,11 +353,11 @@ static DLLSPEC *read_import_lib( struct import *imp ) return NULL; /* the same file was already loaded, ignore this one */ } - if (spec->nb_entry_points) + if (spec->exports.nb_entry_points) { - imp->exports = xmalloc( spec->nb_entry_points * sizeof(*imp->exports) ); - for (i = 0; i < spec->nb_entry_points; i++) - imp->exports[imp->nb_exports++] = &spec->entry_points[i]; + imp->exports = xmalloc( spec->exports.nb_entry_points * sizeof(*imp->exports) ); + for (i = 0; i < spec->exports.nb_entry_points; i++) + imp->exports[imp->nb_exports++] = spec->exports.entry_points[i]; qsort( imp->exports, imp->nb_exports, sizeof(*imp->exports), func_cmp ); } return spec; @@ -493,13 +493,13 @@ static void add_undef_import( const char *name, int is_ordinal ) } /* check if the spec file exports any stubs */ -static int has_stubs( const DLLSPEC *spec ) +static int has_stubs( const struct exports *exports ) { int i; - for (i = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < exports->nb_entry_points; i++) { - ORDDEF *odp = &spec->entry_points[i]; + ORDDEF *odp = exports->entry_points[i]; if (odp->type == TYPE_STUB) return 1; } return 0; @@ -510,12 +510,12 @@ static void add_extra_undef_symbols( DLLSPEC *spec ) { add_extra_ld_symbol( spec->init_func ); if (spec->type == SPEC_WIN16) add_extra_ld_symbol( "DllMain" ); - if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); + if (has_stubs( &spec->exports )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); if (delayed_imports.count) add_extra_ld_symbol( "__delayLoadHelper2" ); } /* check if a given imported dll is not needed, taking forwards into account */ -static int check_unused( const struct import* imp, const DLLSPEC *spec ) +static int check_unused( const struct import* imp, const struct exports *exports ) { int i; const char *file_name = imp->dll_name; @@ -523,9 +523,9 @@ static int check_unused( const struct import* imp, const DLLSPEC *spec ) const char *p = strchr( file_name, '.' ); if (p && !strcasecmp( p, ".dll" )) len = p - file_name; - for (i = spec->base; i <= spec->limit; i++) + for (i = exports->base; i <= exports->limit; i++) { - ORDDEF *odp = spec->ordinals[i]; + ORDDEF *odp = exports->ordinals[i]; if (!odp || !(odp->flags & FLAG_FORWARD)) continue; if (!strncasecmp( odp->link_name, file_name, len ) && odp->link_name[len] == '.') @@ -541,9 +541,9 @@ static void check_undefined_forwards( DLLSPEC *spec ) char *link_name, *api_name, *dll_name, *p; int i; - for (i = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < spec->exports.nb_entry_points; i++) { - ORDDEF *odp = &spec->entry_points[i]; + ORDDEF *odp = spec->exports.entry_points[i]; if (!(odp->flags & FLAG_FORWARD)) continue; @@ -571,9 +571,9 @@ static void check_undefined_exports( DLLSPEC *spec ) { int i; - for (i = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < spec->exports.nb_entry_points; i++) { - ORDDEF *odp = &spec->entry_points[i]; + ORDDEF *odp = spec->exports.entry_points[i]; if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; if (find_name( odp->link_name, undef_symbols )) @@ -611,9 +611,9 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) as_file = open_temp_output_file( ".s" ); output( "\t.data\n" ); - for (i = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < spec->exports.nb_entry_points; i++) { - ORDDEF *odp = &spec->entry_points[i]; + ORDDEF *odp = spec->exports.entry_points[i]; if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( odp ))); @@ -721,7 +721,7 @@ void resolve_dll_imports( DLLSPEC *spec, struct list *list ) if (!imp->nb_imports) { /* the dll is not used, get rid of it */ - if (check_unused( imp, spec )) + if (check_unused( imp, &spec->exports )) warning( "winebuild: %s imported but no symbols used\n", imp->dll_name ); list_remove( &imp->entry ); free_imports( imp ); @@ -1180,16 +1180,17 @@ static void output_external_link_imports( DLLSPEC *spec ) */ void output_stubs( DLLSPEC *spec ) { + struct exports *exports = &spec->exports; const char *name, *exp_name; int i; - if (!has_stubs( spec )) return; + if (!has_stubs( exports )) return; output( "\n/* stub functions */\n\n" ); - for (i = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < exports->nb_entry_points; i++) { - ORDDEF *odp = &spec->entry_points[i]; + ORDDEF *odp = exports->entry_points[i]; if (odp->type != TYPE_STUB) continue; name = get_stub_name( odp, spec ); @@ -1294,9 +1295,9 @@ void output_stubs( DLLSPEC *spec ) output( "\t%s\n", get_asm_string_section() ); output( ".L__wine_spec_file_name:\n" ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); - for (i = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < exports->nb_entry_points; i++) { - ORDDEF *odp = &spec->entry_points[i]; + ORDDEF *odp = exports->entry_points[i]; if (odp->type != TYPE_STUB) continue; exp_name = odp->name ? odp->name : odp->export_name; if (exp_name) @@ -1611,9 +1612,9 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc strarray_addall( &objs, as_files ); as_files = empty_strarray; - for (i = total = 0; i < spec->nb_entry_points; i++) + for (i = total = 0; i < spec->exports.nb_entry_points; i++) { - const ORDDEF *odp = &spec->entry_points[i]; + const ORDDEF *odp = spec->exports.entry_points[i]; const char *abi_name; char *imp_name; @@ -1745,9 +1746,9 @@ static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) /* entry points */ - for (i = total = 0; i < spec->nb_entry_points; i++) + for (i = total = 0; i < spec->exports.nb_entry_points; i++) { - const ORDDEF *odp = &spec->entry_points[i]; + const ORDDEF *odp = spec->exports.entry_points[i]; if (odp->name) name = odp->name; else if (odp->export_name) name = odp->export_name;

1 0

Jacek Caban : winebuild: Use exports struct for 16-bit modules handlign.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 6ee05835465270c9848cd57154f67c83bc8a59bd URL: https://gitlab.winehq.org/wine/wine/-/commit/6ee05835465270c9848cd57154f67c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 14 01:16:02 2024 +0100 winebuild: Use exports struct for 16-bit modules handlign. --- tools/winebuild/spec16.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 4fcc74978f9..630dc16b69d 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -103,7 +103,7 @@ static void output_entries( DLLSPEC *spec, int first, int count ) for (i = 0; i < count; i++) { - ORDDEF *odp = spec->ordinals[first + i]; + ORDDEF *odp = spec->exports.ordinals[first + i]; output( "\t.byte 0x03\n" ); /* flags: exported & public data */ switch (odp->type) { @@ -134,10 +134,10 @@ static void output_entry_table( DLLSPEC *spec ) { int i, prev = 0, prev_sel = -1, bundle_count = 0; - for (i = 1; i <= spec->limit; i++) + for (i = 1; i <= spec->exports.limit; i++) { int selector = 0; - ORDDEF *odp = spec->ordinals[i]; + ORDDEF *odp = spec->exports.ordinals[i]; if (!odp) continue; if (odp->flags & FLAG_EXPORT32) continue; @@ -499,17 +499,18 @@ static int relay_type_compare( const void *e1, const void *e2 ) */ static void output_module16( DLLSPEC *spec ) { + struct exports *exports = &spec->exports; ORDDEF **typelist; ORDDEF *entry_point = NULL; int i, j, nb_funcs; /* store the main entry point as ordinal 0 */ - if (!spec->ordinals) + if (!exports->ordinals) { - assert(spec->limit == 0); - spec->ordinals = xmalloc( sizeof(spec->ordinals[0]) ); - spec->ordinals[0] = NULL; + assert(exports->limit == 0); + exports->ordinals = xmalloc( sizeof(exports->ordinals[0]) ); + exports->ordinals[0] = NULL; } if (spec->init_func && !(spec->characteristics & IMAGE_FILE_DLL)) { @@ -522,17 +523,17 @@ static void output_module16( DLLSPEC *spec ) entry_point->link_name = xstrdup( spec->init_func ); entry_point->export_name = NULL; entry_point->u.func.nb_args = 0; - assert( !spec->ordinals[0] ); - spec->ordinals[0] = entry_point; + assert( !exports->ordinals[0] ); + exports->ordinals[0] = entry_point; } /* Build sorted list of all argument types, without duplicates */ - typelist = xmalloc( (spec->limit + 1) * sizeof(*typelist) ); + typelist = xmalloc( (exports->limit + 1) * sizeof(*typelist) ); - for (i = nb_funcs = 0; i <= spec->limit; i++) + for (i = nb_funcs = 0; i <= exports->limit; i++) { - ORDDEF *odp = spec->ordinals[i]; + ORDDEF *odp = exports->ordinals[i]; if (!odp) continue; if (is_function( odp )) typelist[nb_funcs++] = odp; } @@ -629,9 +630,9 @@ static void output_module16( DLLSPEC *spec ) output( "\n\t.balign 2\n" ); output( ".L__wine_spec_ne_restab:\n" ); output_resident_name( spec->dll_name, 0 ); - for (i = 1; i <= spec->limit; i++) + for (i = 1; i <= exports->limit; i++) { - ORDDEF *odp = spec->ordinals[i]; + ORDDEF *odp = exports->ordinals[i]; if (!odp || !odp->name[0]) continue; if (odp->flags & FLAG_EXPORT32) continue; output_resident_name( odp->name, i ); @@ -729,9 +730,9 @@ static void output_module16( DLLSPEC *spec ) output( "\t.long 0x%08x,0x%08x\n", arg_types[0], arg_types[1] ); } - for (i = 0; i <= spec->limit; i++) + for (i = 0; i <= exports->limit; i++) { - ORDDEF *odp = spec->ordinals[i]; + ORDDEF *odp = exports->ordinals[i]; if (!odp || !is_function( odp )) continue; output( ".L__wine_%s_%u:\n", spec->c_name, i ); output( "\tpushw %%bp\n" ); @@ -745,9 +746,9 @@ static void output_module16( DLLSPEC *spec ) output( "\n.L__wine_spec_data_segment:\n" ); output( "\t.byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\n" ); /* instance data */ - for (i = 0; i <= spec->limit; i++) + for (i = 0; i <= exports->limit; i++) { - ORDDEF *odp = spec->ordinals[i]; + ORDDEF *odp = exports->ordinals[i]; if (!odp || odp->type != TYPE_VARIABLE) continue; output( ".L__wine_%s_%u:\n", spec->c_name, i ); output( "\t.long " );

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_binop().
by Alexandre Julliard 14 Feb '24

14 Feb '24

Module: vkd3d Branch: master Commit: 217eb06f37eb5fce82b9f80ef8b72c451e28a780 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/217eb06f37eb5fce82b9f80ef8b72… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:10:12 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_binop(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 32cb5bd4..03f71e0f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3529,7 +3529,8 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco "Ignoring flags %#"PRIx64" for a binary operation.", flags); } - src_params = instruction_src_params_alloc(ins, 2, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + return; src_param_init_from_value(&src_params[0], a); src_param_init_from_value(&src_params[1], b); if (code == BINOP_SUB)

1 0