- Wine-Commits - list.winehq.org

Alex Henrie : d3dcompiler_43: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: aca965d7f29b075f07ebe9dcced4362a95f6e3bd URL: https://gitlab.winehq.org/wine/wine/-/commit/aca965d7f29b075f07ebe9dcced436… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:28:25 2023 -0600 d3dcompiler_43: Use debugstr_fourcc instead of debugstr_an. --- dlls/d3dcompiler_43/blob.c | 4 ++-- dlls/d3dcompiler_43/reflection.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index bba1c6f590b..2d729f20486 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -209,7 +209,7 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) break; } - TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_an((const char *)&tag, 4)); + TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_fourcc(tag)); return add; } @@ -341,7 +341,7 @@ static BOOL check_blob_strip(DWORD tag, UINT flags) break; } - TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_an((const char *)&tag, 4)); + TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_fourcc(tag)); return add; } diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e4080da8c21..03329022fd9 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1705,7 +1705,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * break; default: - FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + FIXME("Unhandled section %s!\n", debugstr_fourcc(section->tag)); element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; break; } @@ -1963,7 +1963,7 @@ static HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_refl break; default: - FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + FIXME("Unhandled section %s!\n", debugstr_fourcc(section->tag)); break; } }

1 0

Alex Henrie : winemenubuilder: Disallow desktop integration for batch files.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: e86e228557dd552fcf6d3dc961c09562b64638e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e86e228557dd552fcf6d3dc961c095… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 22:06:09 2023 -0600 winemenubuilder: Disallow desktop integration for batch files. --- programs/winemenubuilder/winemenubuilder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9459b77b502..82fece62eb5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1965,7 +1965,8 @@ static BOOL write_freedesktop_mime_type_entry(const WCHAR *packages_dir, const W static BOOL is_extension_banned(LPCWSTR extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ - if (!wcsicmp(extension, L".com") || + if (!wcsicmp(extension, L".bat") || + !wcsicmp(extension, L".com") || !wcsicmp(extension, L".exe") || !wcsicmp(extension, L".msi")) return TRUE;

1 0

Alex Henrie : loader: Associate Wine with batch files.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 474536c0d66ed79d23703b28e99b7c9bf4ddd3bd URL: https://gitlab.winehq.org/wine/wine/-/commit/474536c0d66ed79d23703b28e99b7c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 22:06:09 2023 -0600 loader: Associate Wine with batch files. --- loader/wine.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.desktop b/loader/wine.desktop index 36dd921d221..c839946c3a8 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -26,7 +26,7 @@ Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Name[ja]=Wine Windowsプログラムローダー Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;application/x-bat Icon=wine NoDisplay=true StartupNotify=true

1 0

Alex Henrie : loader: Translate wine.desktop to Catalan.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 7a22152ba11052eb8e26283af640d48f390a0570 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a22152ba11052eb8e26283af640d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 22:36:30 2023 -0600 loader: Translate wine.desktop to Catalan. --- loader/wine.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.desktop b/loader/wine.desktop index c839946c3a8..ce61e8769fd 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -2,6 +2,7 @@ Type=Application Name=Wine Windows Program Loader Name[ar]=منظومة واين لتشغيل برامج وندوز +Name[ca]=Wine - Carregador de programes de Windows Name[cs]=Zavaděč programů pro Wine Name[de]=Wine Windows-Programmstarter Name[es]=Wine Cargador de programas de Windows

1 0

Alex Henrie : d3dx9_36: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: c7d9c4a8b6c21427fb0dd4d1a31b4dcba28d3cb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7d9c4a8b6c21427fb0dd4d1a31b4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:29:15 2023 -0600 d3dx9_36: Use debugstr_fourcc instead of debugstr_an. --- dlls/d3dx9_36/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 39afe6740c0..419bd92884a 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -214,7 +214,7 @@ const struct pixel_format_desc *get_format_info(D3DFORMAT format) unsigned int i = 0; while(formats[i].format != format && formats[i].format != D3DFMT_UNKNOWN) i++; if (formats[i].format == D3DFMT_UNKNOWN) - FIXME("Unknown format %#x (as FOURCC %s).\n", format, debugstr_an((const char *)&format, 4)); + FIXME("Unknown format %s.\n", debugstr_fourcc(format)); return &formats[i]; }

1 0

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

Oct. 17, 2023

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

Alex Henrie : d3d10: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: beb1805ca09ffa1daac5833a53b93f3cbd473588 URL: https://gitlab.winehq.org/wine/wine/-/commit/beb1805ca09ffa1daac5833a53b93f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:27:31 2023 -0600 d3d10: Use debugstr_fourcc instead of debugstr_an. --- dlls/d3d10/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cc08f1ac1f9..6e2b67bb700 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2853,7 +2853,7 @@ static HRESULT fxlvm_chunk_handler(const struct vkd3d_shader_dxbc_section_desc * size_t data_size = section->data.size; uint32_t tag = section->tag; - TRACE("Chunk tag: %s, size: %Iu.\n", debugstr_an((const char *)&tag, 4), data_size); + TRACE("Chunk tag: %s, size: %Iu.\n", debugstr_fourcc(tag), data_size); switch (tag) { @@ -2867,7 +2867,7 @@ static HRESULT fxlvm_chunk_handler(const struct vkd3d_shader_dxbc_section_desc * return parse_fx10_ctab(ctx, data, data_size); default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); + FIXME("Unhandled chunk %s.\n", debugstr_fourcc(tag)); return S_OK; } } @@ -4325,12 +4325,12 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T section = &dxbc_desc.sections[i]; TRACE("Section %u: tag %s, data {%p, %#Ix}.\n", - i, debugstr_an((const char *)&section->tag, 4), + i, debugstr_fourcc(section->tag), section->data.code, section->data.size); if (section->tag != TAG_FX10) { - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&section->tag, 4)); + FIXME("Unhandled chunk %s.\n", debugstr_fourcc(section->tag)); continue; }

1 0

Alex Henrie : iccvid: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 53383beb3773c37cd47cc79d6bb3178e32e834af URL: https://gitlab.winehq.org/wine/wine/-/commit/53383beb3773c37cd47cc79d6bb317… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:30:54 2023 -0600 iccvid: Use debugstr_fourcc instead of debugstr_an. --- dlls/iccvid/iccvid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 4dc418c590b..cffc75be58e 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -750,7 +750,7 @@ static void ICCVID_dump_BITMAPINFO(const BITMAPINFO * bmi) bmi->bmiHeader.biBitCount, bmi->bmiHeader.biHeight, bmi->bmiHeader.biWidth, - debugstr_an( (const char *)&bmi->bmiHeader.biCompression, 4 ) ); + debugstr_fourcc(bmi->bmiHeader.biCompression)); } static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLORREF blueMask, COLORREF greenMask)

1 0

Alex Henrie : evr: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

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

Eric Pouech : wbemprox: Use correct string id.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

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