2 files changed, 21 insertions, 16 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindowclassregistry.cpp b/src/plugins/platforms/windows/qwindowswindowclassregistry.cpp
index c918407a27a..8bf2fb887f1 100644
--- a/src/plugins/platforms/windows/qwindowswindowclassregistry.cpp
+++ b/src/plugins/platforms/windows/qwindowswindowclassregistry.cpp
@@ -69,25 +69,19 @@ QString QWindowsWindowClassRegistry::registerWindowClass(const QWindowsWindowCla
     // add a UUID. The check needs to be performed for each name
     // in case new message windows are added (QTBUG-81347).
     // Note: GetClassInfo() returns != 0 when a class exists.
-    const auto appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
-    WNDCLASS wcinfo;
-    const bool classExists = GetClassInfo(appInstance, reinterpret_cast<LPCWSTR>(className.utf16()), &wcinfo) != FALSE
-        && wcinfo.lpfnWndProc != description.procedure;
-
-    if (classExists)
+    if (shouldDecorateWindowClassName(description))
         className += QUuid::createUuid().toString();
 
     if (m_registeredWindowClassNames.contains(className))        // already registered in our list
         return className;
 
-    WNDCLASSEX wc;
+    const auto appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
+
+    WNDCLASSEX wc{};
     wc.cbSize = sizeof(WNDCLASSEX);
     wc.style = description.style;
     wc.lpfnWndProc = description.procedure;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = 0;
     wc.hInstance = appInstance;
-    wc.hCursor = nullptr;
     wc.hbrBackground = description.brush;
     if (description.hasIcon) {
         wc.hIcon = static_cast<HICON>(LoadImage(appInstance, L"IDI_ICON1", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
@@ -98,15 +92,9 @@ QString QWindowsWindowClassRegistry::registerWindowClass(const QWindowsWindowCla
         }
         else {
             wc.hIcon = static_cast<HICON>(LoadImage(nullptr, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED));
-            wc.hIconSm = nullptr;
         }
     }
-    else {
-        wc.hIcon = nullptr;
-        wc.hIconSm = nullptr;
-    }
 
-    wc.lpszMenuName = nullptr;
     wc.lpszClassName = reinterpret_cast<LPCWSTR>(className.utf16());
     ATOM atom = RegisterClassEx(&wc);
     if (!atom)
@@ -130,6 +118,21 @@ QString QWindowsWindowClassRegistry::registerWindowClass(QString name, WNDPROC p
     return registerWindowClass(QWindowsWindowClassDescription::fromName(name, procedure));
 }
 
+bool QWindowsWindowClassRegistry::shouldDecorateWindowClassName(const QWindowsWindowClassDescription &description) const
+{
+    return shouldDecorateWindowClassName(description.name, description.procedure);
+}
+
+bool QWindowsWindowClassRegistry::shouldDecorateWindowClassName(const QString &name, WNDPROC procedure) const
+{
+    const auto appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
+
+    WNDCLASS wc{};
+
+    return GetClassInfo(appInstance, reinterpret_cast<LPCWSTR>(name.utf16()), &wc) != FALSE
+        && wc.lpfnWndProc != procedure;
+}
+
 void QWindowsWindowClassRegistry::unregisterWindowClasses()
 {
     const auto appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
diff --git a/src/plugins/platforms/windows/qwindowswindowclassregistry.h b/src/plugins/platforms/windows/qwindowswindowclassregistry.h
index 44f274de2b2..c4a36b7f3c4 100644
--- a/src/plugins/platforms/windows/qwindowswindowclassregistry.h
+++ b/src/plugins/platforms/windows/qwindowswindowclassregistry.h
@@ -34,6 +34,8 @@ public:
 private:
     static QString classNamePrefix();
 
+    bool shouldDecorateWindowClassName(const QWindowsWindowClassDescription &description) const;
+    bool shouldDecorateWindowClassName(const QString &name, WNDPROC procedure) const;
     void unregisterWindowClasses();
 
     static QWindowsWindowClassRegistry *m_instance;