October 2023 - Wine-commits

Alexandre Julliard : ntdll: Also send segment registers to the server on suspend.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: fba6b7a1ed560c63236e9451010ad1ecf960e0bd URL: https://gitlab.winehq.org/wine/wine/-/commit/fba6b7a1ed560c63236e9451010ad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 20:18:28 2023 +0200 ntdll: Also send segment registers to the server on suspend. Fixes some test failures in wow64 mode. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 79d69d11547..eac5d961a07 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2117,7 +2117,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (is_inside_syscall( ucontext )) { DECLSPEC_ALIGN(64) XSTATE xs; - context.c.ContextFlags = CONTEXT_FULL; + context.c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS; context_init_xstate( &context.c, &xs ); NtGetContextThread( GetCurrentThread(), &context.c );

1 0

Fabian Maurer : mf/tests: Increase buffer to prevent stack corruption.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: df01ef80a05bd338fb5756740fdc00029e4e5619 URL: https://gitlab.winehq.org/wine/wine/-/commit/df01ef80a05bd338fb5756740fdc00… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 16 23:51:59 2023 +0200 mf/tests: Increase buffer to prevent stack corruption. init_dmo_media_type_video uses head + extra bytes memory, and with MEDIASUBTYPE_RGB8 the extra bytes are already 1024. This leads to stack corruption. --- dlls/mf/tests/transform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index c5ef1f5960a..e798601a8b5 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1450,7 +1450,7 @@ static void check_dmo_get_output_size_info_video_(int line, IMediaObject *dmo, { DWORD size, alignment, expected_size; DMO_MEDIA_TYPE *type; - char buffer[1024]; + char buffer[2048]; HRESULT hr; type = (void *)buffer; @@ -6071,7 +6071,7 @@ static void test_wmv_decoder_dmo_input_type(void) }; DMO_MEDIA_TYPE *good_input_type, *bad_input_type, type; - char buffer_good_input[1024], buffer_bad_input[1024]; + char buffer_good_input[2048], buffer_bad_input[2048]; const GUID *input_subtype = input_subtypes[0]; LONG width = 16, height = 16; VIDEOINFOHEADER *header; @@ -6326,7 +6326,7 @@ static void test_wmv_decoder_dmo_input_type(void) static void test_wmv_decoder_dmo_output_type(void) { - char buffer_good_output[1024], buffer_bad_output[1024], buffer_input[1024]; + char buffer_good_output[2048], buffer_bad_output[2048], buffer_input[2048]; DMO_MEDIA_TYPE *good_output_type, *bad_output_type, *input_type, type; const GUID* input_subtype = &MEDIASUBTYPE_WMV1; LONG width = 16, height = 16; @@ -6572,7 +6572,7 @@ static void test_wmv_decoder_media_object(void) IMediaObject *media_object; DMO_MEDIA_TYPE *type; const BYTE *wmv_data; - char buffer[1024]; + char buffer[2048]; HRESULT hr; ULONG ret;

1 0

Piotr Caban : gdi32: Fix leak in GdiDeleteSpoolFileHandle.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 846784f03fe061367c14ef829e655974cb01c06d URL: https://gitlab.winehq.org/wine/wine/-/commit/846784f03fe061367c14ef829e6559… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 17 12:17:04 2023 +0200 gdi32: Fix leak in GdiDeleteSpoolFileHandle. --- dlls/gdi32/dc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c21bc99a6b6..5f79150cb93 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2766,6 +2766,7 @@ BOOL WINAPI GdiDeleteSpoolFileHandle( HANDLE h ) for (i = 0; i < sh->devmodes_no; i++) HeapFree( GetProcessHeap(), 0, sh->devmodes[i].devmode ); HeapFree( GetProcessHeap(), 0, sh->devmodes ); + HeapFree( GetProcessHeap(), 0, sh ); return TRUE; }

1 0

Jacek Caban : dwrite: Use DWRITE_FONT_FEATURE_TAG for tags argument type in shape_get_typographic_features.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 2c98df50cb16ed77d90d6e2f8b2e132f16071697 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c98df50cb16ed77d90d6e2f8b2e13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 14:07:39 2023 +0200 dwrite: Use DWRITE_FONT_FEATURE_TAG for tags argument type in shape_get_typographic_features. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/shape.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index e87e747d295..7ad8e602cb0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -829,7 +829,7 @@ extern HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *font extern HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_typographic_features(struct scriptshaping_context *context, const unsigned int *scripts, - unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) DECLSPEC_HIDDEN; + unsigned int max_tagcount, unsigned int *actual_tagcount, DWRITE_FONT_FEATURE_TAG *tags) DECLSPEC_HIDDEN; extern HRESULT shape_check_typographic_feature(struct scriptshaping_context *context, const unsigned int *scripts, unsigned int tag, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 9b2d8b3f1eb..33f7fb78953 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -373,7 +373,7 @@ static int __cdecl tag_array_sorting_compare(const void *a, const void *b) }; HRESULT shape_get_typographic_features(struct scriptshaping_context *context, const unsigned int *scripts, - unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) + unsigned int max_tagcount, unsigned int *actual_tagcount, DWRITE_FONT_FEATURE_TAG *tags) { unsigned int i, j, script_index, language_index; struct tag_array t = { 0 };

1 0

Jacek Caban : dwrite/tests: Avoid implicit DWRITE_RENDERING_MODE to DWRITE_RENDERING_MODE1 casts.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 1ba498c5e6e4971e7a2ee8cf47a50af11a0f18ad URL: https://gitlab.winehq.org/wine/wine/-/commit/1ba498c5e6e4971e7a2ee8cf47a50a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 14:26:36 2023 +0200 dwrite/tests: Avoid implicit DWRITE_RENDERING_MODE to DWRITE_RENDERING_MODE1 casts. --- dlls/dwrite/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 81008db6f23..e2b5b9163f1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7058,7 +7058,8 @@ static void test_GetRecommendedRenderingMode(void) /* IDWriteFontFace3 - and another one */ if (fontface3) { DWRITE_GRID_FIT_MODE gridfit, expected_gridfit; - DWRITE_RENDERING_MODE1 mode1, expected1; + DWRITE_RENDERING_MODE1 mode1; + unsigned int expected1; gasp = get_gasp_flags(fontface, emsize, 1.0f); for (i = 0; i < ARRAY_SIZE(recmode_tests1); ++i)

1 0

Jacek Caban : dwrite: Avoid implicit casts between DWRITE_RENDERING_MODE and DWRITE_RENDERING_MODE1.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 75635053fc810ecd2eaa12a6cd6418d04b301118 URL: https://gitlab.winehq.org/wine/wine/-/commit/75635053fc810ecd2eaa12a6cd6418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 14:16:36 2023 +0200 dwrite: Avoid implicit casts between DWRITE_RENDERING_MODE and DWRITE_RENDERING_MODE1. --- dlls/dwrite/font.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a73f8239587..59ed2a99a5d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -193,7 +193,7 @@ static unsigned int get_glyph_bitmap_pitch(DWRITE_RENDERING_MODE1 rendering_mode return rendering_mode == DWRITE_RENDERING_MODE1_ALIASED ? ((width + 31) >> 5) << 2 : (width + 3) / 4 * 4; } -static HRESULT dwrite_fontface_get_glyph_bitmap(struct dwrite_fontface *fontface, DWRITE_RENDERING_MODE rendering_mode, +static HRESULT dwrite_fontface_get_glyph_bitmap(struct dwrite_fontface *fontface, DWRITE_RENDERING_MODE1 rendering_mode, unsigned int *is_1bpp, struct dwrite_glyphbitmap *bitmap) { struct cache_key key = { .size = bitmap->emsize, .glyph = bitmap->glyph, .mode = DWRITE_MEASURING_MODE_NATURAL }; @@ -1798,7 +1798,7 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac IDWriteRenderingParams *params, DWRITE_RENDERING_MODE1 *rendering_mode, DWRITE_GRID_FIT_MODE *gridfit_mode) { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - unsigned int flags; + unsigned int flags, mode; FLOAT emthreshold; TRACE("%p, %.8e, %.8e, %.8e, %p, %d, %d, %d, %p, %p, %p.\n", iface, emSize, dpiX, dpiY, m, is_sideways, threshold, @@ -1821,11 +1821,12 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac hr = IDWriteRenderingParams_QueryInterface(params, &IID_IDWriteRenderingParams3, (void**)&params3); if (hr == S_OK) { *rendering_mode = IDWriteRenderingParams3_GetRenderingMode1(params3); - *gridfit_mode = IDWriteRenderingParams3_GetGridFitMode(params3); + mode = IDWriteRenderingParams3_GetGridFitMode(params3); IDWriteRenderingParams3_Release(params3); } else - *rendering_mode = IDWriteRenderingParams_GetRenderingMode(params); + mode = IDWriteRenderingParams_GetRenderingMode(params); + *rendering_mode = mode; } emthreshold = threshold == DWRITE_OUTLINE_THRESHOLD_ANTIALIASED ? RECOMMENDED_OUTLINE_AA_THRESHOLD : RECOMMENDED_OUTLINE_A_THRESHOLD; @@ -1834,9 +1835,10 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac if (*rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT) { if (emSize >= emthreshold) - *rendering_mode = DWRITE_RENDERING_MODE1_OUTLINE; + mode = DWRITE_RENDERING_MODE1_OUTLINE; else - *rendering_mode = fontface_renderingmode_from_measuringmode(measuring_mode, emSize, flags); + mode = fontface_renderingmode_from_measuringmode(measuring_mode, emSize, flags); + *rendering_mode = mode; } if (*gridfit_mode == DWRITE_GRID_FIT_MODE_DEFAULT) {

1 0

Gabriel Ivăncescu : jscript: Fix Array.map when last element doesn't exist.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 40b36d4208509d73c9cc3c91e6ba1b1104c524aa URL: https://gitlab.winehq.org/wine/wine/-/commit/40b36d4208509d73c9cc3c91e6ba1b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 17 16:18:53 2023 +0300 jscript: Fix Array.map when last element doesn't exist. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 6 ++++-- dlls/mshtml/tests/es5.js | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 48f665da576..c673b82fed2 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1354,14 +1354,16 @@ static HRESULT Array_map(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned if(argc > 1) context_this = argv[1]; - hres = create_array(ctx, length, &array); + hres = create_array(ctx, 0, &array); if(FAILED(hres)) goto done; for(k = 0; k < length; k++) { hres = jsdisp_get_idx(jsthis, k, &callback_args[0]); - if(hres == DISP_E_UNKNOWNNAME) + if(hres == DISP_E_UNKNOWNNAME) { + hres = S_OK; continue; + } if(FAILED(hres)) break; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7e2f66daabf..fbcb1b42f3e 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -431,6 +431,13 @@ sync_test("array_map", function() { [1,2].map(function() { ok(this.valueOf() === 137, "this.valueOf() = " + this.valueOf()); }, 137); + + r = [1,,2,].map(function(x) { return "" + x; }); + ok(r.length === 3, "[1,,2,].map length = " + r.length); + ok(r[0] === "1", "[1,,2,].map[0] = " + r[0]); + ok(r[2] === "2", "[1,,2,].map[2] = " + r[2]); + ok(!("1" in r), "[1,,2,].map[1] exists"); + ok(!("3" in r), "[1,,2,].map[3] exists"); }); sync_test("array_sort", function() {

1 0

Gabriel Ivăncescu : jscript: Fix Array.reduce when last element doesn't exist.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: ed674d63a4ec07e07a36e0bead84d7ac9bf6c9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed674d63a4ec07e07a36e0bead84d7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 17 16:18:54 2023 +0300 jscript: Fix Array.reduce when last element doesn't exist. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 4 +++- dlls/mshtml/tests/es5.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index c673b82fed2..36f45120055 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1422,8 +1422,10 @@ static HRESULT Array_reduce(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsign for(k = 0; k < length; k++) { hres = jsdisp_get_idx(jsthis, k, &callback_args[1]); - if(hres == DISP_E_UNKNOWNNAME) + if(hres == DISP_E_UNKNOWNNAME) { + hres = S_OK; continue; + } if(FAILED(hres)) break; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index fbcb1b42f3e..b6ce7be3c54 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1336,6 +1336,9 @@ sync_test("reduce", function() { r = [1,2,3].reduce(function(a, value) { return a + value; }, "str"); ok(r === "str123", "reduce() returned " + r); + r = [1,2,].reduce(function(a, value) { return a + value; }, "str"); + ok(r === "str12", "reduce() returned " + r); + array = [1,2,3]; r = array.reduce(function(a, value, index, src) { ok(src === array, "src != array");

1 0

Eric Pouech : wbemprox: Use correct string id.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 828304dab301a733c7b1a6f53c8bd0681fbae6c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/828304dab301a733c7b1a6f53c8bd0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 13:59:35 2023 +0200 wbemprox: Use correct string id. Don't use hard coded string indexes as one of the expected string can be absent, hence decreasing its index; nothing ensures that the strings are placed in the order of the fields in the smbios structure. So use, smbios structures' indexes instead. Wbemprox was also expecting one string too much. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 89 ++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 68 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 038ce99539f..fe496bdde41 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -77,7 +77,7 @@ static const struct column col_bios[] = { L"Manufacturer", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Name", CIM_STRING }, { L"ReleaseDate", CIM_DATETIME|COL_FLAG_DYNAMIC }, - { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"SerialNumber", CIM_STRING }, { L"SMBIOSBIOSVersion", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SMBIOSMajorVersion", CIM_UINT16 }, { L"SMBIOSMinorVersion", CIM_UINT16 }, @@ -1245,7 +1245,7 @@ static const struct smbios_header *find_smbios_entry( enum smbios_type type, con return hdr; } -static WCHAR *get_smbios_string( BYTE id, const char *buf, UINT offset, UINT buflen ) +static WCHAR *get_smbios_string_by_id( BYTE id, const char *buf, UINT offset, UINT buflen ) { const char *ptr = buf + offset; UINT i = 0; @@ -1259,43 +1259,43 @@ static WCHAR *get_smbios_string( BYTE id, const char *buf, UINT offset, UINT buf return NULL; } -static WCHAR *get_baseboard_string( BYTE id, const char *buf, UINT len ) +static WCHAR *get_smbios_string( enum smbios_type type, size_t field_offset, const char *buf, UINT len ) { const struct smbios_header *hdr; - const struct smbios_baseboard *baseboard; UINT offset; - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BASEBOARD, buf, len ))) return NULL; + if (!(hdr = find_smbios_entry( type, buf, len ))) return NULL; - baseboard = (const struct smbios_baseboard *)hdr; - offset = (const char *)baseboard - buf + baseboard->hdr.length; - return get_smbios_string( id, buf, offset, len ); + if (field_offset + sizeof(BYTE) > hdr->length) return NULL; + + offset = (const char *)hdr - buf + hdr->length; + return get_smbios_string_by_id( ((const BYTE *)hdr)[field_offset], buf, offset, len ); } static WCHAR *get_baseboard_manufacturer( const char *buf, UINT len ) { - WCHAR *ret = get_baseboard_string( 1, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BASEBOARD, offsetof(struct smbios_baseboard, vendor), buf, len ); if (!ret) return wcsdup( L"Intel Corporation" ); return ret; } static WCHAR *get_baseboard_product( const char *buf, UINT len ) { - WCHAR *ret = get_baseboard_string( 2, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BASEBOARD, offsetof(struct smbios_baseboard, product), buf, len ); if (!ret) return wcsdup( L"Base Board" ); return ret; } static WCHAR *get_baseboard_serialnumber( const char *buf, UINT len ) { - WCHAR *ret = get_baseboard_string( 4, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BASEBOARD, offsetof(struct smbios_baseboard, serial), buf, len ); if (!ret) return wcsdup( L"None" ); return ret; } static WCHAR *get_baseboard_version( const char *buf, UINT len ) { - WCHAR *ret = get_baseboard_string( 3, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BASEBOARD, offsetof(struct smbios_baseboard, version), buf, len ); if (!ret) return wcsdup( L"1.0" ); return ret; } @@ -1344,23 +1344,9 @@ static UINT16 get_bios_smbiosminorversion( const char *buf, UINT len ) if (len < sizeof(*prologue)) return 0; return prologue->minor_version; } - -static WCHAR *get_bios_string( BYTE id, const char *buf, UINT len ) -{ - const struct smbios_header *hdr; - const struct smbios_bios *bios; - UINT offset; - - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return NULL; - - bios = (const struct smbios_bios *)hdr; - offset = (const char *)bios - buf + bios->hdr.length; - return get_smbios_string( id, buf, offset, len ); -} - static WCHAR *get_bios_manufacturer( const char *buf, UINT len ) { - WCHAR *ret = get_bios_string( 1, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BIOS, offsetof(struct smbios_bios, vendor), buf, len ); if (!ret) return wcsdup( L"The Wine Project" ); return ret; } @@ -1398,22 +1384,15 @@ static WCHAR *convert_bios_date( const WCHAR *str ) static WCHAR *get_bios_releasedate( const char *buf, UINT len ) { - WCHAR *ret, *date = get_bios_string( 3, buf, len ); + WCHAR *ret, *date = get_smbios_string( SMBIOS_TYPE_BIOS, offsetof(struct smbios_bios, date), buf, len ); if (!date || !(ret = convert_bios_date( date ))) ret = wcsdup( L"20120608000000.000000+000" ); free( date ); return ret; } -static WCHAR *get_bios_serialnumber( const char *buf, UINT len ) -{ - WCHAR *ret = get_bios_string( 4, buf, len ); - if (!ret) return wcsdup( L"0" ); - return ret; -} - static WCHAR *get_bios_smbiosbiosversion( const char *buf, UINT len ) { - WCHAR *ret = get_bios_string( 2, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BIOS, offsetof(struct smbios_bios, version), buf, len ); if (!ret) return wcsdup( L"Wine" ); return ret; } @@ -1488,7 +1467,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond rec->manufacturer = get_bios_manufacturer( buf, len ); rec->name = L"Default System BIOS"; rec->releasedate = get_bios_releasedate( buf, len ); - rec->serialnumber = get_bios_serialnumber( buf, len ); + rec->serialnumber = L"Serial number"; rec->smbiosbiosversion = get_bios_smbiosbiosversion( buf, len ); rec->smbiosmajorversion = get_bios_smbiosmajorversion( buf, len ); rec->smbiosminorversion = get_bios_smbiosminorversion( buf, len ); @@ -1669,29 +1648,16 @@ static WCHAR *get_username(void) return ret; } -static WCHAR *get_compsysproduct_string( BYTE id, const char *buf, UINT len ) -{ - const struct smbios_header *hdr; - const struct smbios_system *system; - UINT offset; - - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return NULL; - - system = (const struct smbios_system *)hdr; - offset = (const char *)system - buf + system->hdr.length; - return get_smbios_string( id, buf, offset, len ); -} - static WCHAR *get_compsysproduct_name( const char *buf, UINT len ) { - WCHAR *ret = get_compsysproduct_string( 2, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_SYSTEM, offsetof(struct smbios_system, product), buf, len ); if (!ret) return wcsdup( L"Wine" ); return ret; } static WCHAR *get_compsysproduct_vendor( const char *buf, UINT len ) { - WCHAR *ret = get_compsysproduct_string( 1, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_SYSTEM, offsetof(struct smbios_system, vendor), buf, len ); if (!ret) return wcsdup( L"The Wine Project" ); return ret; } @@ -1733,7 +1699,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co static WCHAR *get_compsysproduct_identifyingnumber( const char *buf, UINT len ) { - WCHAR *ret = get_compsysproduct_string( 4, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_SYSTEM, offsetof(struct smbios_system, serial), buf, len ); if (!ret) return wcsdup( L"0" ); return ret; } @@ -1761,7 +1727,7 @@ done: static WCHAR *get_compsysproduct_version( const char *buf, UINT len ) { - WCHAR *ret = get_compsysproduct_string( 3, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_SYSTEM, offsetof(struct smbios_system, version), buf, len ); if (!ret) return wcsdup( L"1.0" ); return ret; } @@ -4054,22 +4020,9 @@ static enum fill_status fill_sid( struct table *table, const struct expr *cond ) return FILL_STATUS_FILTERED; } -static WCHAR *get_systemenclosure_string( BYTE id, const char *buf, UINT len ) -{ - const struct smbios_header *hdr; - const struct smbios_chassis *chassis; - UINT offset; - - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_CHASSIS, buf, len ))) return NULL; - - chassis = (const struct smbios_chassis *)hdr; - offset = (const char *)chassis - buf + chassis->hdr.length; - return get_smbios_string( id, buf, offset, len ); -} - static WCHAR *get_systemenclosure_manufacturer( const char *buf, UINT len ) { - WCHAR *ret = get_systemenclosure_string( 1, buf, len ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_CHASSIS, offsetof(struct smbios_chassis, vendor), buf, len ); if (!ret) return wcsdup( L"Wine" ); return ret; }

1 0

Alex Henrie : evr: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 4fef7086602c5eec78104857da6029b133f1c73e URL: https://gitlab.winehq.org/wine/wine/-/commit/4fef7086602c5eec78104857da6029… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:30:20 2023 -0600 evr: Use debugstr_fourcc instead of debugstr_an. --- dlls/evr/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 702e4640831..5c2049a61da 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -213,7 +213,7 @@ HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *p */ BOOL WINAPI MFIsFormatYUV(DWORD format) { - TRACE("%s.\n", debugstr_an((char *)&format, 4)); + TRACE("%s.\n", debugstr_fourcc(format)); switch (format) {

1 0