From 346ae348ae7ee5a594c9fcd17114ae949c1ce201 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 13 Jun 2022 15:09:41 +0300
Subject: Popup+: fix for a madness with default popup class values

---
 src/core/stdpopup/src/options.cpp  | 2 +-
 src/core/stdpopup/src/services.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdpopup/src/options.cpp b/src/core/stdpopup/src/options.cpp
index cff89de23e..6e196dfea7 100644
--- a/src/core/stdpopup/src/options.cpp
+++ b/src/core/stdpopup/src/options.cpp
@@ -465,7 +465,7 @@ public:
 			POPUPCLASS pc = *p;
 			pc.PluginWindowProc = nullptr;
 
-			POPUPDATACLASS d = { sizeof(d) };
+			POPUPDATACLASS d = {};
 			d.pszClassName = pc.pszName;
 			if (p->flags & PCF_UNICODE) {
 				d.szTitle.w = TranslateT("Preview");
diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp
index b743e173df..aa5defdb00 100644
--- a/src/core/stdpopup/src/services.cpp
+++ b/src/core/stdpopup/src/services.cpp
@@ -337,7 +337,6 @@ static INT_PTR UnregisterPopupClass(WPARAM, LPARAM lParam)
 static INT_PTR CreateClassPopup(WPARAM wParam, LPARAM lParam)
 {
 	POPUPDATACLASS *pdc = (POPUPDATACLASS *)lParam;
-	if (pdc->cbSize < sizeof(POPUPDATACLASS)) return 1;
 
 	POPUPCLASS *pc = nullptr;
 	if (wParam)
-- 
cgit v1.2.3