May 2024 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL in htmlattribute.c.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: d7618eb2cda00da6b7ed79c6bd43fef73c3b0517 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7618eb2cda00da6b7ed79c6bd43fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 14 12:10:57 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL in htmlattribute.c. --- dlls/mshtml/htmlattr.c | 98 ++------------------------------------------------ 1 file changed, 2 insertions(+), 96 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index cbd847038d6..8a652619b59 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -37,55 +37,7 @@ static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *i return CONTAINING_RECORD(iface, HTMLDOMAttribute, IHTMLDOMAttribute_iface); } -static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, - REFIID riid, void **ppv) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfoCount(IHTMLDOMAttribute *iface, UINT *pctinfo) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfo(IHTMLDOMAttribute *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMAttribute_GetIDsOfNames(IHTMLDOMAttribute *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMAttribute, IHTMLDOMAttribute, impl_from_IHTMLDOMAttribute(iface)->dispex) static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BSTR *p) { @@ -200,53 +152,7 @@ static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute2(IHTMLDOMAttribute2 return CONTAINING_RECORD(iface, HTMLDOMAttribute, IHTMLDOMAttribute2_iface); } -static HRESULT WINAPI HTMLDOMAttribute2_QueryInterface(IHTMLDOMAttribute2 *iface, REFIID riid, void **ppv) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - return IHTMLDOMAttribute_QueryInterface(&This->IHTMLDOMAttribute_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMAttribute2_AddRef(IHTMLDOMAttribute2 *iface) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - return IHTMLDOMAttribute_AddRef(&This->IHTMLDOMAttribute_iface); -} - -static ULONG WINAPI HTMLDOMAttribute2_Release(IHTMLDOMAttribute2 *iface) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - return IHTMLDOMAttribute_Release(&This->IHTMLDOMAttribute_iface); -} - -static HRESULT WINAPI HTMLDOMAttribute2_GetTypeInfoCount(IHTMLDOMAttribute2 *iface, UINT *pctinfo) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMAttribute2_GetTypeInfo(IHTMLDOMAttribute2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMAttribute2_GetIDsOfNames(IHTMLDOMAttribute2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMAttribute2_Invoke(IHTMLDOMAttribute2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMAttribute2, IHTMLDOMAttribute2, impl_from_IHTMLDOMAttribute2(iface)->dispex) static HRESULT WINAPI HTMLDOMAttribute2_get_name(IHTMLDOMAttribute2 *iface, BSTR *p) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL in htmlcomment.c.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 462264f6d735a8c3e7970135e79e2865df2552ff URL: https://gitlab.winehq.org/wine/wine/-/commit/462264f6d735a8c3e7970135e79e28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 14 12:11:57 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL in htmlcomment.c. --- dlls/mshtml/htmlcomment.c | 55 ++--------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 398e59cc04f..a96915a58cc 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -43,59 +43,8 @@ static inline HTMLCommentElement *impl_from_IHTMLCommentElement(IHTMLCommentElem return CONTAINING_RECORD(iface, HTMLCommentElement, IHTMLCommentElement_iface); } -static HRESULT WINAPI HTMLCommentElement_QueryInterface(IHTMLCommentElement *iface, - REFIID riid, void **ppv) -{ - HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLCommentElement_AddRef(IHTMLCommentElement *iface) -{ - HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLCommentElement_Release(IHTMLCommentElement *iface) -{ - HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLCommentElement_GetTypeInfoCount(IHTMLCommentElement *iface, UINT *pctinfo) -{ - HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLCommentElement_GetTypeInfo(IHTMLCommentElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLCommentElement_GetIDsOfNames(IHTMLCommentElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLCommentElement_Invoke(IHTMLCommentElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLCommentElement, IHTMLCommentElement, + impl_from_IHTMLCommentElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLCommentElement_put_text(IHTMLCommentElement *iface, BSTR v) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL in htmlarea.c.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 2b46fd48a0f77cc12ace2644920614c28e5951b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b46fd48a0f77cc12ace2644920614… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 14 12:09:16 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL in htmlarea.c. --- dlls/mshtml/htmlarea.c | 54 ++------------------------------------------------ 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 96c5ba9322f..f00c621adc2 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -45,58 +45,8 @@ static inline HTMLAreaElement *impl_from_IHTMLAreaElement(IHTMLAreaElement *ifac return CONTAINING_RECORD(iface, HTMLAreaElement, IHTMLAreaElement_iface); } -static HRESULT WINAPI HTMLAreaElement_QueryInterface(IHTMLAreaElement *iface, REFIID riid, void **ppv) -{ - HTMLAreaElement *This = impl_from_IHTMLAreaElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLAreaElement_AddRef(IHTMLAreaElement *iface) -{ - HTMLAreaElement *This = impl_from_IHTMLAreaElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLAreaElement_Release(IHTMLAreaElement *iface) -{ - HTMLAreaElement *This = impl_from_IHTMLAreaElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLAreaElement_GetTypeInfoCount(IHTMLAreaElement *iface, UINT *pctinfo) -{ - HTMLAreaElement *This = impl_from_IHTMLAreaElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLAreaElement_GetTypeInfo(IHTMLAreaElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLAreaElement *This = impl_from_IHTMLAreaElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLAreaElement_GetIDsOfNames(IHTMLAreaElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLAreaElement *This = impl_from_IHTMLAreaElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLAreaElement_Invoke(IHTMLAreaElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLAreaElement *This = impl_from_IHTMLAreaElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLAreaElement, IHTMLAreaElement, + impl_from_IHTMLAreaElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLAreaElement_put_shape(IHTMLAreaElement *iface, BSTR v) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL in htmlanchor.c.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 8c485be20060f3cbbc22d163c911fee8a845813d URL: https://gitlab.winehq.org/wine/wine/-/commit/8c485be20060f3cbbc22d163c911fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 14 12:08:13 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL in htmlanchor.c. --- dlls/mshtml/htmlanchor.c | 55 ++---------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index efd2fa9b06e..670cd48795d 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -201,59 +201,8 @@ static inline HTMLAnchorElement *impl_from_IHTMLAnchorElement(IHTMLAnchorElement return CONTAINING_RECORD(iface, HTMLAnchorElement, IHTMLAnchorElement_iface); } -static HRESULT WINAPI HTMLAnchorElement_QueryInterface(IHTMLAnchorElement *iface, - REFIID riid, void **ppv) -{ - HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLAnchorElement_AddRef(IHTMLAnchorElement *iface) -{ - HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLAnchorElement_Release(IHTMLAnchorElement *iface) -{ - HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLAnchorElement_GetTypeInfoCount(IHTMLAnchorElement *iface, UINT *pctinfo) -{ - HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLAnchorElement_GetTypeInfo(IHTMLAnchorElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLAnchorElement_GetIDsOfNames(IHTMLAnchorElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLAnchorElement_Invoke(IHTMLAnchorElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLAnchorElement, IHTMLAnchorElement, + impl_from_IHTMLAnchorElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLAnchorElement_put_href(IHTMLAnchorElement *iface, BSTR v) {

1 0

Victor Chiletto : vkd3d-shader/hlsl: Avoid a null pointer dereference in hlsl_block_cleanup (UBSan).
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: vkd3d Branch: master Commit: c9af34ab285e40ae3285ccfd93d63a9470333b30 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c9af34ab285e40ae3285ccfd93d63… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Mon May 6 07:53:14 2024 -0300 vkd3d-shader/hlsl: Avoid a null pointer dereference in hlsl_block_cleanup (UBSan). destroy_block() is called with a NULL block from: * create_loop, through the loop rules for while and do-while loops. * The selection_statement rule, in the case $6.else_block is NULL. * free_parse_initializer. --- libs/vkd3d-shader/hlsl.y | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 79317bb0..c6b6219e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -168,6 +168,9 @@ static struct list *make_empty_list(struct hlsl_ctx *ctx) static void destroy_block(struct hlsl_block *block) { + if (!block) + return; + hlsl_block_cleanup(block); vkd3d_free(block); }

1 0

Alexandre Julliard : wineboot: Support multiple SMBIOS entries of the same type.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 7097c614b282d35904b8bb7d96e24124b11c40f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7097c614b282d35904b8bb7d96e241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 12:56:58 2024 +0200 wineboot: Support multiple SMBIOS entries of the same type. --- programs/wineboot/wineboot.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b14754ce638..645b7173196 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -604,7 +604,8 @@ struct smbios_system #define RSMB (('R' << 24) | ('S' << 16) | ('M' << 8) | 'B') -static const struct smbios_header *find_smbios_entry( enum smbios_type type, const char *buf, UINT len ) +static const struct smbios_header *find_smbios_entry( enum smbios_type type, unsigned int index, + const char *buf, UINT len ) { const char *ptr, *start; const struct smbios_prologue *prologue; @@ -630,20 +631,16 @@ static const struct smbios_header *find_smbios_entry( enum smbios_type type, con if (hdr->type == type) { if ((const char *)hdr - start + hdr->length > prologue->length) return NULL; - break; + if (!index--) return hdr; } - else /* skip other entries and their strings */ + /* skip other entries and their strings */ + for (ptr = (const char *)hdr + hdr->length; ptr - buf < len && *ptr; ptr++) { - for (ptr = (const char *)hdr + hdr->length; ptr - buf < len && *ptr; ptr++) - { - for (; ptr - buf < len; ptr++) if (!*ptr) break; - } - if (ptr == (const char *)hdr + hdr->length) ptr++; - hdr = (const struct smbios_header *)(ptr + 1); + for (; ptr - buf < len; ptr++) if (!*ptr) break; } + if (ptr == (const char *)hdr + hdr->length) ptr++; + hdr = (const struct smbios_header *)(ptr + 1); } - - return hdr; } static inline WCHAR *heap_strdupAW( const char *src ) @@ -684,7 +681,7 @@ static void create_bios_baseboard_values( HKEY bios_key, const char *buf, UINT l const struct smbios_baseboard *baseboard; UINT offset; - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BASEBOARD, buf, len ))) return; + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BASEBOARD, 0, buf, len ))) return; baseboard = (const struct smbios_baseboard *)hdr; offset = (const char *)baseboard - buf + baseboard->hdr.length; @@ -699,7 +696,7 @@ static void create_bios_bios_values( HKEY bios_key, const char *buf, UINT len ) const struct smbios_bios *bios; UINT offset; - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return; + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, 0, buf, len ))) return; bios = (const struct smbios_bios *)hdr; offset = (const char *)bios - buf + bios->hdr.length; @@ -729,7 +726,7 @@ static void create_bios_system_values( HKEY bios_key, const char *buf, UINT len const struct smbios_system *system; UINT offset; - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return; + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, 0, buf, len ))) return; system = (const struct smbios_system *)hdr; offset = (const char *)system - buf + system->hdr.length;

1 0

Alexandre Julliard : wineboot: Get the CPU model details with NtQuerySystemInformation(SystemCpuInformation).
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: c50dc0512c2e56cfc38c79f471947349cdbe9c08 URL: https://gitlab.winehq.org/wine/wine/-/commit/c50dc0512c2e56cfc38c79f4719473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 12:44:11 2024 +0200 wineboot: Get the CPU model details with NtQuerySystemInformation(SystemCpuInformation). --- programs/wineboot/wineboot.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index cd49e98abf4..4de60a439d2 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -522,30 +522,6 @@ static void regs_to_str( int *regs, unsigned int len, WCHAR *buffer ) buffer[i] = 0; } -static unsigned int get_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) -{ - unsigned int model, family_id = (reg0 & (0x0f << 8)) >> 8; - - model = (reg0 & (0x0f << 4)) >> 4; - if (family_id == 6 || family_id == 15) model |= (reg0 & (0x0f << 16)) >> 12; - - *family = family_id; - if (family_id == 15) *family += (reg0 & (0xff << 20)) >> 20; - - *stepping = reg0 & 0x0f; - return model; -} - -static void get_identifier( WCHAR *buf, size_t size, const WCHAR *arch ) -{ - unsigned int family, model, stepping; - int regs[4] = {0, 0, 0, 0}; - - __cpuid( regs, 1 ); - model = get_model( regs[0], &stepping, &family ); - swprintf( buf, size, L"%s Family %u Model %u Stepping %u", arch, family, model, stepping ); -} - static void get_vendorid( WCHAR *buf ) { int tmp, regs[4] = {0, 0, 0, 0}; @@ -560,7 +536,6 @@ static void get_vendorid( WCHAR *buf ) #else /* __i386__ || __x86_64__ */ -static void get_identifier( WCHAR *buf, size_t size, const WCHAR *arch ) { } static void get_vendorid( WCHAR *buf ) { } #endif /* __i386__ || __x86_64__ */ @@ -838,13 +813,16 @@ static void create_hardware_registry_keys(void) case PROCESSOR_ARCHITECTURE_AMD64: arch = L"AMD64"; - get_identifier( id, ARRAY_SIZE(id), !wcscmp(vendorid, L"AuthenticAMD") ? L"AMD64" : L"Intel64" ); + swprintf( id, ARRAY_SIZE(id), L"%s Family %u Model %u Stepping %u", + !wcscmp(vendorid, L"AuthenticAMD") ? L"AMD64" : L"Intel64", + sci.ProcessorLevel, HIBYTE(sci.ProcessorRevision), LOBYTE(sci.ProcessorRevision) ); break; case PROCESSOR_ARCHITECTURE_INTEL: default: arch = L"x86"; - get_identifier( id, ARRAY_SIZE(id), L"x86" ); + swprintf( id, ARRAY_SIZE(id), L"x86 Family %u Model %u Stepping %u", + sci.ProcessorLevel, HIBYTE(sci.ProcessorRevision), LOBYTE(sci.ProcessorRevision) ); break; }

1 0

Alexandre Julliard : wineboot: Create CPU environment keys together with other hardware keys.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: c3b1259f75abe610fee6fdceb3eb8e32595c0368 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3b1259f75abe610fee6fdceb3eb8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 12:43:07 2024 +0200 wineboot: Create CPU environment keys together with other hardware keys. --- programs/wineboot/wineboot.c | 101 +++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 66 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 67d9508389f..cd49e98abf4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -802,13 +802,14 @@ done: static void create_hardware_registry_keys(void) { unsigned int i; - HKEY hkey, system_key, cpu_key, fpu_key; + HKEY hkey, system_key, cpu_key, fpu_key, env_key; SYSTEM_CPU_INFORMATION sci; PROCESSOR_POWER_INFORMATION* power_info; ULONG sizeof_power_info = sizeof(PROCESSOR_POWER_INFORMATION) * NtCurrentTeb()->Peb->NumberOfProcessors; UINT64 tsc_frequency = read_tsc_frequency(); ULONG name_buffer[16]; - WCHAR id[60], vendorid[13]; + const WCHAR *arch; + WCHAR id[60], buffer[128], vendorid[13]; get_vendorid( vendorid ); NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); @@ -824,17 +825,25 @@ static void create_hardware_registry_keys(void) switch (sci.ProcessorArchitecture) { case PROCESSOR_ARCHITECTURE_ARM: - case PROCESSOR_ARCHITECTURE_ARM64: + arch = L"ARM"; swprintf( id, ARRAY_SIZE(id), L"ARM Family %u Model %u Revision %u", sci.ProcessorLevel, HIBYTE(sci.ProcessorRevision), LOBYTE(sci.ProcessorRevision) ); break; + case PROCESSOR_ARCHITECTURE_ARM64: + arch = L"ARM64"; + swprintf( id, ARRAY_SIZE(id), L"ARMv8 (64-bit) Family %u Model %u Revision %u", + sci.ProcessorLevel, HIBYTE(sci.ProcessorRevision), LOBYTE(sci.ProcessorRevision) ); + break; + case PROCESSOR_ARCHITECTURE_AMD64: + arch = L"AMD64"; get_identifier( id, ARRAY_SIZE(id), !wcscmp(vendorid, L"AuthenticAMD") ? L"AMD64" : L"Intel64" ); break; case PROCESSOR_ARCHITECTURE_INTEL: default: + arch = L"x86"; get_identifier( id, ARRAY_SIZE(id), L"x86" ); break; } @@ -857,14 +866,12 @@ static void create_hardware_registry_keys(void) case PROCESSOR_ARCHITECTURE_AMD64: default: set_reg_value( system_key, L"Identifier", L"AT compatible" ); + if (RegCreateKeyExW( system_key, L"FloatingPointProcessor", 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) + fpu_key = 0; break; } - if (sci.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM || - sci.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64 || - RegCreateKeyExW( system_key, L"FloatingPointProcessor", 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) - fpu_key = 0; if (RegCreateKeyExW( system_key, L"CentralProcessor", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &cpu_key, NULL )) cpu_key = 0; @@ -899,6 +906,26 @@ static void create_hardware_registry_keys(void) } } + if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Session Manager\\Environment", + &env_key )) + { + set_reg_value( env_key, L"PROCESSOR_ARCHITECTURE", arch ); + + swprintf( buffer, ARRAY_SIZE(buffer), L"%s, %s", id, vendorid ); + set_reg_value( env_key, L"PROCESSOR_IDENTIFIER", buffer ); + + swprintf( buffer, ARRAY_SIZE(buffer), L"%u", sci.ProcessorLevel ); + set_reg_value( env_key, L"PROCESSOR_LEVEL", buffer ); + + swprintf( buffer, ARRAY_SIZE(buffer), L"%04x", sci.ProcessorRevision ); + set_reg_value( env_key, L"PROCESSOR_REVISION", buffer ); + + swprintf( buffer, ARRAY_SIZE(buffer), L"%u", NtCurrentTeb()->Peb->NumberOfProcessors ); + set_reg_value( env_key, L"NUMBER_OF_PROCESSORS", buffer ); + RegCloseKey( env_key ); + } + create_bios_key( system_key ); RegCloseKey( fpu_key ); @@ -919,63 +946,6 @@ static void create_dynamic_registry_keys(void) RegCloseKey( key ); } -/* create the platform-specific environment registry keys */ -static void create_environment_registry_keys( void ) -{ - HKEY env_key; - SYSTEM_CPU_INFORMATION sci; - WCHAR buffer[60], vendorid[13]; - const WCHAR *arch, *parch; - - if (RegCreateKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Session Manager\\Environment", &env_key )) return; - - get_vendorid( vendorid ); - NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); - - swprintf( buffer, ARRAY_SIZE(buffer), L"%u", NtCurrentTeb()->Peb->NumberOfProcessors ); - set_reg_value( env_key, L"NUMBER_OF_PROCESSORS", buffer ); - - switch (sci.ProcessorArchitecture) - { - case PROCESSOR_ARCHITECTURE_AMD64: - arch = L"AMD64"; - parch = !wcscmp(vendorid, L"AuthenticAMD") ? L"AMD64" : L"Intel64"; - break; - - case PROCESSOR_ARCHITECTURE_INTEL: - default: - arch = parch = L"x86"; - break; - } - set_reg_value( env_key, L"PROCESSOR_ARCHITECTURE", arch ); - - switch (sci.ProcessorArchitecture) - { - case PROCESSOR_ARCHITECTURE_ARM: - case PROCESSOR_ARCHITECTURE_ARM64: - swprintf( buffer, ARRAY_SIZE(buffer), L"ARM Family %u Model %u Revision %u", - sci.ProcessorLevel, HIBYTE(sci.ProcessorRevision), LOBYTE(sci.ProcessorRevision) ); - break; - - case PROCESSOR_ARCHITECTURE_AMD64: - case PROCESSOR_ARCHITECTURE_INTEL: - default: - get_identifier( buffer, ARRAY_SIZE(buffer), parch ); - lstrcatW( buffer, L", " ); - lstrcatW( buffer, vendorid ); - break; - } - set_reg_value( env_key, L"PROCESSOR_IDENTIFIER", buffer ); - - swprintf( buffer, ARRAY_SIZE(buffer), L"%u", sci.ProcessorLevel ); - set_reg_value( env_key, L"PROCESSOR_LEVEL", buffer ); - - swprintf( buffer, ARRAY_SIZE(buffer), L"%04x", sci.ProcessorRevision ); - set_reg_value( env_key, L"PROCESSOR_REVISION", buffer ); - - RegCloseKey( env_key ); -} - /* create the ComputerName registry keys */ static void create_computer_name_keys(void) { @@ -1859,7 +1829,6 @@ int __cdecl main( int argc, char *argv[] ) create_user_shared_data(); create_hardware_registry_keys(); create_dynamic_registry_keys(); - create_environment_registry_keys(); create_computer_name_keys(); wininit(); pendingRename();

1 0

Alexandre Julliard : wineboot: Retrieve CPU details through the SMBIOS table.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: ecbc4cf06d6c9253ba92065f320ddd6eeff3177f URL: https://gitlab.winehq.org/wine/wine/-/commit/ecbc4cf06d6c9253ba92065f320ddd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:12:53 2024 +0200 wineboot: Retrieve CPU details through the SMBIOS table. --- programs/wineboot/wineboot.c | 284 ++++++++++++++++++++++--------------------- 1 file changed, 144 insertions(+), 140 deletions(-)

1 0

Alexandre Julliard : wineboot: Report the correct model number on ARM platforms.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 73c798021be9b492b35071d662b182bf8f5c310c URL: https://gitlab.winehq.org/wine/wine/-/commit/73c798021be9b492b35071d662b182… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 12:44:46 2024 +0200 wineboot: Report the correct model number on ARM platforms. --- programs/wineboot/wineboot.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4de60a439d2..b14754ce638 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -461,7 +461,6 @@ static void create_user_shared_data(void) case PROCESSOR_ARCHITECTURE_ARM: features[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_VFP_32); features[PF_ARM_NEON_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_NEON); - features[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = (sci.ProcessorLevel >= 8); break; case PROCESSOR_ARCHITECTURE_ARM64: @@ -801,14 +800,14 @@ static void create_hardware_registry_keys(void) { case PROCESSOR_ARCHITECTURE_ARM: arch = L"ARM"; - swprintf( id, ARRAY_SIZE(id), L"ARM Family %u Model %u Revision %u", - sci.ProcessorLevel, HIBYTE(sci.ProcessorRevision), LOBYTE(sci.ProcessorRevision) ); + swprintf( id, ARRAY_SIZE(id), L"ARM Family 7 Model %X Revision %X", + sci.ProcessorLevel, sci.ProcessorRevision ); break; case PROCESSOR_ARCHITECTURE_ARM64: arch = L"ARM64"; - swprintf( id, ARRAY_SIZE(id), L"ARMv8 (64-bit) Family %u Model %u Revision %u", - sci.ProcessorLevel, HIBYTE(sci.ProcessorRevision), LOBYTE(sci.ProcessorRevision) ); + swprintf( id, ARRAY_SIZE(id), L"ARMv8 (64-bit) Family 8 Model %X Revision %X", + sci.ProcessorLevel, sci.ProcessorRevision ); break; case PROCESSOR_ARCHITECTURE_AMD64:

1 0