From 789aa2edb6337739caccbf0a5769d2419ffd4bb9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 24 Jul 2019 17:13:02 +0300 Subject: code cleaning --- src/core/stdpopup/src/options.cpp | 6 ++++-- src/mir_app/src/popups.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/stdpopup/src/options.cpp b/src/core/stdpopup/src/options.cpp index d8f10fe511..0dbbaba995 100644 --- a/src/core/stdpopup/src/options.cpp +++ b/src/core/stdpopup/src/options.cpp @@ -429,7 +429,8 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam if (arNewClasses[i]->flags & PCF_UNICODE) { POPUPCLASS pc = *arNewClasses[i]; pc.PluginWindowProc = nullptr; - POPUPDATACLASS d = { sizeof(d), pc.pszName }; + POPUPDATACLASS d = { sizeof(d) }; + d.pszClassName = pc.pszName; d.szTitle.w = L"Preview"; d.szText.w = L"The quick brown fox jumps over the lazy dog."; CallService(MS_POPUP_ADDPOPUPCLASS, (WPARAM)& pc, (LPARAM)& d); @@ -437,7 +438,8 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam else { POPUPCLASS pc = *arNewClasses[i]; pc.PluginWindowProc = nullptr; - POPUPDATACLASS d = { sizeof(d), pc.pszName }; + POPUPDATACLASS d = { sizeof(d) }; + d.pszClassName = pc.pszName; d.szTitle.a = "Preview"; d.szText.a = "The quick brown fox jumps over the lazy dog."; CallService(MS_POPUP_ADDPOPUPCLASS, (WPARAM)& pc, (LPARAM)& d); diff --git a/src/mir_app/src/popups.cpp b/src/mir_app/src/popups.cpp index d6958bcb46..c2ace7d45f 100644 --- a/src/mir_app/src/popups.cpp +++ b/src/mir_app/src/popups.cpp @@ -140,7 +140,8 @@ MIR_APP_DLL(HWND) Popup_AddClass(POPUPDATACLASS *pData) MIR_APP_DLL(HWND) ShowClassPopup(const char *name, const char *title, const char *text) { - POPUPDATACLASS d = { sizeof(d), name }; + POPUPDATACLASS d = { sizeof(d) }; + d.pszClassName = name; d.szTitle.a = title; d.szText.a = text; return (HWND)CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&d); @@ -148,7 +149,8 @@ MIR_APP_DLL(HWND) ShowClassPopup(const char *name, const char *title, const char MIR_APP_DLL(HWND) ShowClassPopupW(const char *name, const wchar_t *title, const wchar_t *text) { - POPUPDATACLASS d = { sizeof(d), name }; + POPUPDATACLASS d = { sizeof(d) }; + d.pszClassName = name; d.szTitle.w = title; d.szText.w = text; return (HWND)CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&d); -- cgit v1.2.3