1 files changed, 24 insertions, 11 deletions

diff --git a/src/tools/tracegen/etw.cpp b/src/tools/tracegen/etw.cpp
index 415a0a8dcb..f54a7896ea 100644
--- a/src/tools/tracegen/etw.cpp
+++ b/src/tools/tracegen/etw.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Rafael Roquetto <rafael.roquetto@kdab.com>
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "etw.h"
 #include "provider.h"
@@ -31,7 +31,7 @@ static void writeEtwMacro(QTextStream &stream, const Tracepoint::Field &field)
         return;
     }
 
-    switch (field.backendType.backendType) {
+    switch (field.backendType) {
     case Tracepoint::Field::QtString:
         stream << "TraceLoggingCountedWideString(reinterpret_cast<LPCWSTR>("
                << name << ".utf16()), static_cast<ULONG>(" << name << ".size()), \""
@@ -45,12 +45,14 @@ static void writeEtwMacro(QTextStream &stream, const Tracepoint::Field &field)
         stream << "TraceLoggingValue(" << name << ".toEncoded().constData(), \"" << name << "\")";
         return;
     case Tracepoint::Field::QtRect:
+    case Tracepoint::Field::QtRectF:
         stream << "TraceLoggingValue(" << name << ".x(), \"x\"), "
                << "TraceLoggingValue(" << name << ".y(), \"y\"), "
                << "TraceLoggingValue(" << name << ".width(), \"width\"), "
                << "TraceLoggingValue(" << name << ".height(), \"height\")";
         return;
     case Tracepoint::Field::QtSize:
+    case Tracepoint::Field::QtSizeF:
         stream << "TraceLoggingValue(" << name << ".width(), \"width\"), "
                << "TraceLoggingValue(" << name << ".height(), \"height\")";
         return;
@@ -66,7 +68,7 @@ static void writeEtwMacro(QTextStream &stream, const Tracepoint::Field &field)
         return;
     case Tracepoint::Field::EnumeratedType:
     case Tracepoint::Field::FlagType:
-        stream << "TraceLoggingString(trace_convert_" << typeToName(field.paramType) << "(" << name << ").toUtf8().constData(), \"" << name << "\")";
+        stream << "TraceLoggingString(trace_convert_" << typeToTypeName(field.paramType) << "(" << name << ").toUtf8().constData(), \"" << name << "\")";
         return;
     default:
         break;
@@ -102,6 +104,7 @@ static QString createGuid(const QUuid &uuid)
 
 static void writePrologue(QTextStream &stream, const QString &fileName, const Provider &provider)
 {
+    writeCommonPrologue(stream);
     QUuid uuid = QUuid::createUuidV5(QUuid(), provider.name.toLocal8Bit());
 
     const QString providerV = providerVar(provider.name);
@@ -177,7 +180,7 @@ static void writeWrapper(QTextStream &stream, const Provider &provider, const Tr
     // Convert all unknown types to QString's using QDebug.
     // Note the naming convention: it's field.name##Str
     for (const Tracepoint::Field &field : tracepoint.fields) {
-        if (field.backendType.backendType == Tracepoint::Field::Unknown) {
+        if (field.backendType == Tracepoint::Field::Unknown) {
             stream << "    const QString " << field.name << "Str = QDebug::toString(" << field.name
                    << ");\n";
         }
@@ -206,7 +209,7 @@ static void writeWrapper(QTextStream &stream, const Provider &provider, const Tr
 
 static void writeEnumConverter(QTextStream &stream, const TraceEnum &enumeration)
 {
-    stream << "inline QString trace_convert_" << typeToName(enumeration.name) << "(" << enumeration.name << " val)\n";
+    stream << "inline QString trace_convert_" << typeToTypeName(enumeration.name) << "(" << enumeration.name << " val)\n";
     stream << "{\n";
     for (const auto &v : enumeration.values) {
         if (v.range != 0) {
@@ -215,9 +218,14 @@ static void writeEnumConverter(QTextStream &stream, const TraceEnum &enumeration
         }
     }
     stream << "\n    QString ret;\n    switch (val) {\n";
+
+    QList<int> handledValues;
     for (const auto &v : enumeration.values) {
-        if (v.range == 0)
-            stream << "    case " << v.value << ": ret = QStringLiteral(\"" << v.name << "\"); break;\n";
+        if (v.range == 0 && !handledValues.contains(v.value)) {
+            stream << "    case " << v.value << ": ret = QStringLiteral(\""
+                   << aggregateListValues(v.value, enumeration.values) << "\"); break;\n";
+            handledValues.append(v.value);
+        }
     }
 
     stream << "    }\n    return ret;\n}\n";
@@ -225,17 +233,22 @@ static void writeEnumConverter(QTextStream &stream, const TraceEnum &enumeration
 
 static void writeFlagConverter(QTextStream &stream, const TraceFlags &flag)
 {
-    stream << "inline QString trace_convert_" << typeToName(flag.name) << "(" << flag.name << " val)\n";
+    stream << "inline QString trace_convert_" << typeToTypeName(flag.name) << "(" << flag.name << " val)\n";
     stream << "{\n    QString ret;\n";
     for (const auto &v : flag.values) {
         if (v.value == 0) {
-            stream << "    if (val == 0)\n        return QStringLiteral(\"" << v.name << "\");\n";
+            stream << "    if (val == 0)\n        return QStringLiteral(\""
+                   << aggregateListValues(v.value, flag.values) << "\");\n";
             break;
         }
     }
+    QList<int> handledValues;
     for (const auto &v : flag.values) {
-        if (v.value != 0)
-            stream << "    if (val & " << (1 << (v.value - 1)) << ") { if (ret.length()) ret += QLatin1Char(\'|\'); ret += QStringLiteral(\"" << v.name << "\"); }\n";
+        if (v.value != 0 && !handledValues.contains(v.value)) {
+            stream << "    if (val & " << (1 << (v.value - 1))
+                   << ") { if (ret.length()) ret += QLatin1Char(\'|\'); ret += QStringLiteral(\"" << v.name << "\"); }\n";
+            handledValues.append(v.value);
+        }
     }
     stream << "    return ret;\n}\n";
 }