mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-07 11:14:58 -06:00
23.01
This commit is contained in:
@@ -16,7 +16,13 @@ extern bool g_IsNT;
|
||||
namespace NWindows {
|
||||
namespace NControl {
|
||||
|
||||
static INT_PTR APIENTRY MyProperyPageProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
static
|
||||
#ifdef Z7_OLD_WIN_SDK
|
||||
BOOL
|
||||
#else
|
||||
INT_PTR
|
||||
#endif
|
||||
APIENTRY MyProperyPageProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
CWindow tempDialog(dialogHWND);
|
||||
if (message == WM_INITDIALOG)
|
||||
@@ -34,75 +40,91 @@ bool CPropertyPage::OnNotify(UINT /* controlID */, LPNMHDR lParam)
|
||||
{
|
||||
switch (lParam->code)
|
||||
{
|
||||
case PSN_APPLY: SetMsgResult(OnApply(LPPSHNOTIFY(lParam))); break;
|
||||
case PSN_KILLACTIVE: SetMsgResult(BoolToBOOL(OnKillActive(LPPSHNOTIFY(lParam)))); break;
|
||||
case PSN_SETACTIVE: SetMsgResult(OnSetActive(LPPSHNOTIFY(lParam))); break;
|
||||
case PSN_RESET: OnReset(LPPSHNOTIFY(lParam)); break;
|
||||
case PSN_HELP: OnNotifyHelp(LPPSHNOTIFY(lParam)); break;
|
||||
case PSN_APPLY: SetMsgResult(OnApply2(LPPSHNOTIFY(lParam))); break;
|
||||
case PSN_KILLACTIVE: SetMsgResult(BoolToBOOL(OnKillActive2(LPPSHNOTIFY(lParam)))); break;
|
||||
case PSN_SETACTIVE: SetMsgResult(OnSetActive2(LPPSHNOTIFY(lParam))); break;
|
||||
case PSN_RESET: OnReset2(LPPSHNOTIFY(lParam)); break;
|
||||
case PSN_HELP: OnNotifyHelp2(LPPSHNOTIFY(lParam)); break;
|
||||
default: return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
PROPSHEETPAGE fields depend from
|
||||
#if (_WIN32_WINNT >= 0x0600)
|
||||
#elif (_WIN32_WINNT >= 0x0501)
|
||||
#elif (_WIN32_IE >= 0x0400)
|
||||
PROPSHEETHEADER fields depend from
|
||||
#if (_WIN32_IE >= 0x0400)
|
||||
*/
|
||||
#if defined(PROPSHEETPAGEA_V1_SIZE) && !defined(Z7_OLD_WIN_SDK)
|
||||
#ifndef _UNICODE
|
||||
#define my_compatib_PROPSHEETPAGEA PROPSHEETPAGEA_V1
|
||||
#endif
|
||||
#define my_compatib_PROPSHEETPAGEW PROPSHEETPAGEW_V1
|
||||
#else
|
||||
// for old mingw:
|
||||
#ifndef _UNICODE
|
||||
#define my_compatib_PROPSHEETPAGEA PROPSHEETPAGEA
|
||||
#endif
|
||||
#define my_compatib_PROPSHEETPAGEW PROPSHEETPAGEW
|
||||
#endif
|
||||
|
||||
INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndParent, const UString &title)
|
||||
{
|
||||
#ifndef _UNICODE
|
||||
AStringVector titles;
|
||||
#endif
|
||||
#ifndef _UNICODE
|
||||
CRecordVector<PROPSHEETPAGEA> pagesA;
|
||||
#endif
|
||||
CRecordVector<PROPSHEETPAGEW> pagesW;
|
||||
|
||||
unsigned i;
|
||||
#ifndef _UNICODE
|
||||
AStringVector titles;
|
||||
for (i = 0; i < pagesInfo.Size(); i++)
|
||||
titles.Add(GetSystemString(pagesInfo[i].Title));
|
||||
CRecordVector<my_compatib_PROPSHEETPAGEA> pagesA;
|
||||
#endif
|
||||
CRecordVector<my_compatib_PROPSHEETPAGEW> pagesW;
|
||||
|
||||
for (i = 0; i < pagesInfo.Size(); i++)
|
||||
{
|
||||
const CPageInfo &pageInfo = pagesInfo[i];
|
||||
#ifndef _UNICODE
|
||||
{
|
||||
PROPSHEETPAGE page;
|
||||
my_compatib_PROPSHEETPAGEA page;
|
||||
memset(&page, 0, sizeof(page));
|
||||
page.dwSize = sizeof(page);
|
||||
page.dwFlags = PSP_HASHELP;
|
||||
page.hInstance = g_hInstance;
|
||||
page.pszTemplate = MAKEINTRESOURCE(pageInfo.ID);
|
||||
page.pszIcon = NULL;
|
||||
page.pszTemplate = MAKEINTRESOURCEA(pageInfo.ID);
|
||||
// page.pszIcon = NULL;
|
||||
page.pfnDlgProc = NWindows::NControl::MyProperyPageProcedure;
|
||||
|
||||
if (titles[i].IsEmpty())
|
||||
page.pszTitle = NULL;
|
||||
else
|
||||
if (!titles[i].IsEmpty())
|
||||
{
|
||||
page.dwFlags |= PSP_USETITLE;
|
||||
page.pszTitle = titles[i];
|
||||
page.dwFlags |= PSP_USETITLE;
|
||||
}
|
||||
// else page.pszTitle = NULL;
|
||||
page.lParam = (LPARAM)pageInfo.Page;
|
||||
page.pfnCallback = NULL;
|
||||
// page.pfnCallback = NULL;
|
||||
pagesA.Add(page);
|
||||
}
|
||||
#endif
|
||||
{
|
||||
PROPSHEETPAGEW page;
|
||||
my_compatib_PROPSHEETPAGEW page;
|
||||
memset(&page, 0, sizeof(page));
|
||||
page.dwSize = sizeof(page);
|
||||
page.dwFlags = PSP_HASHELP;
|
||||
page.hInstance = g_hInstance;
|
||||
page.pszTemplate = MAKEINTRESOURCEW(pageInfo.ID);
|
||||
page.pszIcon = NULL;
|
||||
// page.pszIcon = NULL;
|
||||
page.pfnDlgProc = NWindows::NControl::MyProperyPageProcedure;
|
||||
|
||||
if (pageInfo.Title.IsEmpty())
|
||||
page.pszTitle = NULL;
|
||||
else
|
||||
if (!pageInfo.Title.IsEmpty())
|
||||
{
|
||||
page.dwFlags |= PSP_USETITLE;
|
||||
page.pszTitle = pageInfo.Title;
|
||||
page.dwFlags |= PSP_USETITLE;
|
||||
}
|
||||
// else page.pszTitle = NULL;
|
||||
page.lParam = (LPARAM)pageInfo.Page;
|
||||
page.pfnCallback = NULL;
|
||||
// page.pfnCallback = NULL;
|
||||
pagesW.Add(page);
|
||||
}
|
||||
}
|
||||
@@ -110,16 +132,16 @@ INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndPare
|
||||
#ifndef _UNICODE
|
||||
if (!g_IsNT)
|
||||
{
|
||||
PROPSHEETHEADER sheet;
|
||||
PROPSHEETHEADERA sheet;
|
||||
sheet.dwSize = sizeof(sheet);
|
||||
sheet.dwFlags = PSH_PROPSHEETPAGE;
|
||||
sheet.hwndParent = hwndParent;
|
||||
sheet.hInstance = g_hInstance;
|
||||
AString titleA (GetSystemString(title));
|
||||
sheet.pszCaption = titleA;
|
||||
sheet.nPages = pagesInfo.Size();
|
||||
sheet.nPages = pagesA.Size();
|
||||
sheet.nStartPage = 0;
|
||||
sheet.ppsp = &pagesA.Front();
|
||||
sheet.ppsp = (LPCPROPSHEETPAGEA)(const void *)&pagesA.Front();
|
||||
sheet.pfnCallback = NULL;
|
||||
return ::PropertySheetA(&sheet);
|
||||
}
|
||||
@@ -132,9 +154,9 @@ INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndPare
|
||||
sheet.hwndParent = hwndParent;
|
||||
sheet.hInstance = g_hInstance;
|
||||
sheet.pszCaption = title;
|
||||
sheet.nPages = pagesInfo.Size();
|
||||
sheet.nPages = pagesW.Size();
|
||||
sheet.nStartPage = 0;
|
||||
sheet.ppsp = &pagesW.Front();
|
||||
sheet.ppsp = (LPCPROPSHEETPAGEW)(const void *)&pagesW.Front();
|
||||
sheet.pfnCallback = NULL;
|
||||
return ::PropertySheetW(&sheet);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user