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

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL in htmlattribute.c.
by Alexandre Julliard 14 May '24

14 May '24

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 14 May '24

14 May '24

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 htmlcurstyle.c.
by Alexandre Julliard 14 May '24

14 May '24

Module: wine Branch: master Commit: 5807aa7a189bbff2e12bd7eb6b577b8084c03d3f URL: https://gitlab.winehq.org/wine/wine/-/commit/5807aa7a189bbff2e12bd7eb6b577b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 14 12:16:14 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL in htmlcurstyle.c. --- dlls/mshtml/htmlcurstyle.c | 208 ++------------------------------------------- 1 file changed, 8 insertions(+), 200 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL for DocumentType object implementation.
by Alexandre Julliard 14 May '24

14 May '24

Module: wine Branch: master Commit: 8e84698871f4f50e3b93e11ee72d9901149e790b URL: https://gitlab.winehq.org/wine/wine/-/commit/8e84698871f4f50e3b93e11ee72d99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 14 12:23:51 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL for DocumentType object implementation. --- dlls/mshtml/htmldoc.c | 54 ++------------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e16b75675d5..118f4706f37 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -158,58 +158,8 @@ static inline DocumentType *impl_from_IDOMDocumentType(IDOMDocumentType *iface) return CONTAINING_RECORD(iface, DocumentType, IDOMDocumentType_iface); } -static HRESULT WINAPI DocumentType_QueryInterface(IDOMDocumentType *iface, REFIID riid, void **ppv) -{ - DocumentType *This = impl_from_IDOMDocumentType(iface); - - return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI DocumentType_AddRef(IDOMDocumentType *iface) -{ - DocumentType *This = impl_from_IDOMDocumentType(iface); - - return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI DocumentType_Release(IDOMDocumentType *iface) -{ - DocumentType *This = impl_from_IDOMDocumentType(iface); - - return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI DocumentType_GetTypeInfoCount(IDOMDocumentType *iface, UINT *pctinfo) -{ - DocumentType *This = impl_from_IDOMDocumentType(iface); - - return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI DocumentType_GetTypeInfo(IDOMDocumentType *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - DocumentType *This = impl_from_IDOMDocumentType(iface); - - return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI DocumentType_GetIDsOfNames(IDOMDocumentType *iface, REFIID riid, LPOLESTR *rgszNames, - UINT cNames, LCID lcid, DISPID *rgDispId) -{ - DocumentType *This = impl_from_IDOMDocumentType(iface); - - return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI DocumentType_Invoke(IDOMDocumentType *iface, DISPID dispIdMember, REFIID riid, LCID lcid, - WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - DocumentType *This = impl_from_IDOMDocumentType(iface); - - return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(DocumentType, IDOMDocumentType, + impl_from_IDOMDocumentType(iface)->node.event_target.dispex) static HRESULT WINAPI DocumentType_get_name(IDOMDocumentType *iface, BSTR *p) {

1 0

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

14 May '24

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 : configure: Restore warning for missing PE compiler.
by Alexandre Julliard 14 May '24

14 May '24

Module: wine Branch: master Commit: 4f68f67cb5d6c88a062220044f15b9cce8b2c418 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f68f67cb5d6c88a062220044f15b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 09:46:58 2024 +0200 configure: Restore warning for missing PE compiler. It was dropped in cda2886fd3018c9e8c12791238db481b528f6a65. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56665 --- configure | 11 +++++++++++ configure.ac | 3 +++ 2 files changed, 14 insertions(+) diff --git a/configure b/configure index 0468aea1422..2d1564bfea8 100755 --- a/configure +++ b/configure @@ -12027,6 +12027,17 @@ case $HOST_ARCH in arm|aarch64) test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 DLLEXT="" ;; + *) + if test "x$PE_ARCHS" = "x" +then : + case "x$with_mingw" in + x) as_fn_append wine_notices "|Suitable PE cross-compiler not found, PE files won't be built." ;; + xno) ;; + *) as_fn_error $? "Suitable PE cross-compiler not found, PE files won't be built. +This is an error since --with-mingw was requested." "$LINENO" 5 ;; +esac + +fi ;; esac diff --git a/configure.ac b/configure.ac index 31c2fa2588e..71398ef9b29 100644 --- a/configure.ac +++ b/configure.ac @@ -1016,6 +1016,9 @@ case $HOST_ARCH in arm|aarch64) test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw.]) DLLEXT="" ;; + *) + WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], + [Suitable PE cross-compiler not found, PE files won't be built.]) ;; esac dnl **** External libraries ****

1 0

Alexandre Julliard : ntdll: Report the correct processor details on ARM platforms.
by Alexandre Julliard 14 May '24

14 May '24

Module: wine Branch: master Commit: cd5eb0f143fa13795374530c603231cff40cbb8a URL: https://gitlab.winehq.org/wine/wine/-/commit/cd5eb0f143fa13795374530c603231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 10:45:37 2024 +0200 ntdll: Report the correct processor details on ARM platforms. --- dlls/ntdll/tests/info.c | 17 ++++---- dlls/ntdll/unix/system.c | 108 +++++++++++++++-------------------------------- 2 files changed, 42 insertions(+), 83 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 88086a83f59..8e8abbfb467 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -358,16 +358,15 @@ static void test_query_cpu(void) if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits); ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n", sci.ProcessorFeatureBits); - - ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", - sci.ProcessorLevel, sci2.ProcessorLevel ); - ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", - sci.ProcessorRevision, sci2.ProcessorRevision ); - ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", - sci.MaximumProcessors, sci2.MaximumProcessors ); - ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", - sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); } + ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", + sci.ProcessorLevel, sci2.ProcessorLevel ); + ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", + sci.ProcessorRevision, sci2.ProcessorRevision ); + ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", + sci.MaximumProcessors, sci2.MaximumProcessors ); + ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", + sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); memset(&sci3, 0xcc, sizeof(sci3)); status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci3, sizeof(sci3), &len); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index dcfc2ebd980..fc9dfa90355 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -538,71 +538,12 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) info->ProcessorFeatureBits = cpu_features.ProcessorFeatureBits = features; } -#elif defined(__arm__) - -static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) -{ - ULONGLONG features = 0; -#ifdef linux - char line[512]; - char *s, *value; - FILE *f = fopen("/proc/cpuinfo", "r"); - if (f) - { - while (fgets( line, sizeof(line), f )) - { - /* NOTE: the ':' is the only character we can rely on */ - if (!(value = strchr(line,':'))) continue; - /* terminate the valuename */ - s = value - 1; - while ((s >= line) && (*s == ' ' || *s == '\t')) s--; - s[1] = 0; - /* and strip leading spaces from value */ - value += 1; - while (*value == ' ' || *value == '\t') value++; - if ((s = strchr( value,'\n' ))) *s = 0; - if (!strcmp( line, "CPU architecture" )) - { - info->ProcessorLevel = atoi(value); - continue; - } - if (!strcmp( line, "CPU revision" )) - { - info->ProcessorRevision = atoi(value); - continue; - } - if (!strcmp( line, "Features" )) - { - if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; - if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; - continue; - } - } - fclose( f ); - } -#elif defined(__FreeBSD__) - size_t valsize; - char buf[8]; - int value; - - valsize = sizeof(buf); - if (!sysctlbyname("hw.machine_arch", &buf, &valsize, NULL, 0) && sscanf(buf, "armv%i", &value) == 1) - info->ProcessorLevel = value; - - valsize = sizeof(value); - if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0)) features |= CPU_FEATURE_ARM_VFP_32; -#else - FIXME("CPU Feature detection not implemented.\n"); -#endif - info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM; - info->ProcessorFeatureBits = cpu_features.ProcessorFeatureBits = features; -} - -#elif defined(__aarch64__) +#elif defined(__arm__) || defined(__aarch64__) static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { ULONGLONG features = 0; + unsigned int implementer = 0x41, part = 0, variant = 0, revision = 0; #ifdef linux char line[512]; char *s, *value; @@ -621,24 +562,23 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) value += 1; while (*value == ' ' || *value == '\t') value++; if ((s = strchr( value,'\n' ))) *s = 0; - if (!strcmp( line, "CPU architecture" )) - { - info->ProcessorLevel = atoi(value); - continue; - } - if (!strcmp( line, "CPU revision" )) - { - info->ProcessorRevision = atoi(value); - continue; - } - if (!strcmp( line, "Features" )) + if (!strcmp( line, "CPU implementer" )) implementer = strtoul( value, NULL, 0); + else if (!strcmp( line, "CPU part" )) part = strtoul( value, NULL, 0); + else if (!strcmp( line, "CPU variant" )) variant = strtoul( value, NULL, 0); + else if (!strcmp( line, "CPU revision" )) revision = strtoul( value, NULL, 0); + else if (!strcmp( line, "Features" )) { +#ifdef __arm__ + if (strstr(value, "vfpv3")) features |= CPU_FEATURE_ARM_VFP_32; + if (strstr(value, "neon")) features |= CPU_FEATURE_ARM_NEON; +#else if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; if (strstr(value, "atomics")) features |= CPU_FEATURE_ARM_V81_ATOMIC; if (strstr(value, "asimddp")) features |= CPU_FEATURE_ARM_V82_DP; if (strstr(value, "jscvt")) features |= CPU_FEATURE_ARM_V83_JSCVT; if (strstr(value, "lrcpc")) features |= CPU_FEATURE_ARM_V83_LRCPC; +#endif continue; } } @@ -647,9 +587,29 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) #else FIXME("CPU Feature detection not implemented.\n"); #endif - info->ProcessorLevel = max(info->ProcessorLevel, 8); +#ifdef __arm__ + info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM; +#else info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; +#endif info->ProcessorFeatureBits = cpu_features.ProcessorFeatureBits = features; + info->ProcessorLevel = part; + info->ProcessorRevision = (variant << 8) | revision; + cpu_id = (implementer << 24) | (variant << 20) | (0x0f << 16) | (part << 4) | revision; + switch (implementer) + { + case 0x41: strcpy( cpu_vendor, "ARM" ); break; + case 0x42: strcpy( cpu_vendor, "Broadcom" ); break; + case 0x43: strcpy( cpu_vendor, "Cavium" ); break; + case 0x44: strcpy( cpu_vendor, "DEC" ); break; + case 0x4e: strcpy( cpu_vendor, "Nvidia" ); break; + case 0x50: strcpy( cpu_vendor, "APM" ); break; + case 0x51: strcpy( cpu_vendor, "Qualcomm" ); break; + case 0x53: strcpy( cpu_vendor, "Samsung" ); break; + case 0x56: strcpy( cpu_vendor, "Marvell" ); break; + case 0x66: strcpy( cpu_vendor, "Faraday" ); break; + case 0x69: strcpy( cpu_vendor, "Intel" ); break; + } } #endif /* End architecture specific feature detection for CPUs */ @@ -1348,7 +1308,7 @@ void init_cpu_info(void) num = 1; FIXME("Detecting the number of processors is not supported.\n"); #endif - peb->NumberOfProcessors = num; + peb->NumberOfProcessors = cpu_info.MaximumProcessors = num; get_cpuinfo( &cpu_info ); TRACE( "<- CPU arch %d, level %d, rev %d, features 0x%x\n", (int)cpu_info.ProcessorArchitecture, (int)cpu_info.ProcessorLevel,

1 0

Alexandre Julliard : ntdll: Update PROCESSOR_ARCHITECTURE variable correctly for ARM platforms.
by Alexandre Julliard 14 May '24

14 May '24

Module: wine Branch: master Commit: 9dca2a707269dce7723e5a72204220560d3641d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9dca2a707269dce7723e5a72204220… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 12:28:51 2024 +0200 ntdll: Update PROCESSOR_ARCHITECTURE variable correctly for ARM platforms. --- dlls/ntdll/env.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 04e4ba94563..14f00ab1538 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -46,6 +46,18 @@ static inline SIZE_T get_env_length( const WCHAR *env ) return end + 1 - env; } +static UNICODE_STRING *get_machine_name( USHORT machine, UNICODE_STRING *str ) +{ + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: RtlInitUnicodeString( str, L"x86" ); break; + case IMAGE_FILE_MACHINE_AMD64: RtlInitUnicodeString( str, L"AMD64" ); break; + case IMAGE_FILE_MACHINE_ARMNT: RtlInitUnicodeString( str, L"ARM" ); break; + case IMAGE_FILE_MACHINE_ARM64: RtlInitUnicodeString( str, L"ARM64" ); break; + default: RtlInitUnicodeString( str, L"Unknown" ); break; + } + return str; +} /*********************************************************************** * set_wow64_environment @@ -59,23 +71,17 @@ static void set_wow64_environment( WCHAR **env ) UNICODE_STRING arch6432_strW = RTL_CONSTANT_STRING( L"PROCESSOR_ARCHITEW6432" ); UNICODE_STRING valW = { 0, sizeof(buf), buf }; UNICODE_STRING nameW; + USHORT machine = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress )->FileHeader.Machine; /* set the PROCESSOR_ARCHITECTURE variable */ - if (!RtlQueryEnvironmentVariable_U( *env, &arch6432_strW, &valW )) - { - if (is_win64) - { - RtlSetEnvironmentVariable( env, &arch_strW, &valW ); - RtlSetEnvironmentVariable( env, &arch6432_strW, NULL ); - } - } - else if (NtCurrentTeb64() && !RtlQueryEnvironmentVariable_U( *env, &arch_strW, &valW )) + RtlSetEnvironmentVariable( env, &arch_strW, get_machine_name( machine, &nameW )); + if (NtCurrentTeb()->WowTebOffset) { - RtlSetEnvironmentVariable( env, &arch6432_strW, &valW ); - RtlInitUnicodeString( &nameW, L"x86" ); - RtlSetEnvironmentVariable( env, &arch_strW, &nameW ); + RtlWow64GetProcessMachines( GetCurrentProcess(), NULL, &machine ); + RtlSetEnvironmentVariable( env, &arch6432_strW, get_machine_name( machine, &nameW )); } + else RtlSetEnvironmentVariable( env, &arch6432_strW, NULL ); /* set the ProgramFiles variables */

1 0

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

14 May '24

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: Get the CPU model details with NtQuerySystemInformation(SystemCpuInformation).
by Alexandre Julliard 14 May '24

14 May '24

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