Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-03 17:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Handle the Progman Folder options message and tab switching support (#5574)

Browse source 
* Handle the "OnShowOptionsDlg" message
* Support switching tabs
* Update dll/win32/shell32/dialogs/folder_options.cpp
* Update dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
* ShowFolderOptionsDialog workaround
* Added Vista pages, define for magic message

---------

Co-authored-by: Stanislav Motylkov <x86corez@gmail.com>
Co-authored-by: Thamatip Chitpong <weedgamer131@gmail.com>
This commit is contained in:
Whindmar Saksit 2024-04-05 03:53:57 +02:00 • committed by GitHub
parent 5b82ada2ed
commit 8841e3d7ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 84 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

58
dll/win32/shell32/dialogs/folder_options.cpp
View file

@ -192,10 +192,13 @@ HBITMAP CreateRadioMask(HDC hDC)
// CMSGlobalFolderOptionsStub --- The owner window of Folder Options.
// This window hides taskbar button of Folder Options.
#define GlobalFolderOptionsClassName _T("MSGlobalFolderOptionsStub")
class CMSGlobalFolderOptionsStub : public CWindowImpl<CMSGlobalFolderOptionsStub>
{
public:
DECLARE_WND_CLASS_EX(_T("MSGlobalFolderOptionsStub"), 0, COLOR_WINDOWTEXT)
DECLARE_WND_CLASS_EX(GlobalFolderOptionsClassName, 0, COLOR_WINDOWTEXT)
BEGIN_MSG_MAP(CMSGlobalFolderOptionsStub)
END_MSG_MAP()
@ -222,8 +225,14 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam)
return 0;
}
static VOID
ShowFolderOptionsDialog(HWND hWnd, HINSTANCE hInst)
enum {
PAGE_GENERAL,
PAGE_VIEW,
PAGE_FILETYPES
};
static DWORD CALLBACK
ShowFolderOptionsDialogThreadProc(LPVOID param)
{
PROPSHEETHEADERW pinfo;
HPROPSHEETPAGE hppages[3];
@ -254,7 +263,7 @@ ShowFolderOptionsDialog(HWND hWnd, HINSTANCE hInst)
if (!stub.Create(NULL, NULL, NULL, style, exstyle))
{
ERR("stub.Create failed\n");
return;
return 0;
}
memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW));
@ -266,10 +275,34 @@ ShowFolderOptionsDialog(HWND hWnd, HINSTANCE hInst)
pinfo.pszIcon = MAKEINTRESOURCEW(IDI_SHELL_FOLDER_OPTIONS);
pinfo.pszCaption = szOptions;
pinfo.pfnCallback = PropSheetProc;
pinfo.nStartPage = PtrToUlong(param);
PropertySheetW(&pinfo);
stub.DestroyWindow();
return 0;
}
VOID WINAPI
ShowFolderOptionsDialog(UINT Page, BOOL Async = FALSE)
{
HWND hWnd = FindWindow(GlobalFolderOptionsClassName, NULL);
if (hWnd)
{
HWND hPop = GetLastActivePopup(hWnd);
if (hWnd == GetParent(hPop))
{
PostMessage(hPop, PSM_SETCURSEL, Page, 0);
}
SetForegroundWindow(hPop);
return;
}
LPVOID param = UlongToPtr(Page);
if (Async)
SHCreateThread(ShowFolderOptionsDialogThreadProc, param, 0, 0);
else
ShowFolderOptionsDialogThreadProc(param); // Rundll32 caller cannot be async!
}
static VOID
@ -278,13 +311,20 @@ Options_RunDLLCommon(HWND hWnd, HINSTANCE hInst, int fOptions, DWORD nCmdShow)
switch(fOptions)
{
case 0:
ShowFolderOptionsDialog(hWnd, hInst);
ShowFolderOptionsDialog(PAGE_GENERAL);
break;
case 1:
// show taskbar options dialog
FIXME("notify explorer to show taskbar options dlg\n");
//PostMessage(GetShellWindow(), WM_USER+22, fOptions, 0);
case 1: // Taskbar settings
#if (NTDDI_VERSION >= NTDDI_VISTA)
case 3: // Start menu settings
case 4: // Tray icon settings
case 6: // Taskbar toolbars
#endif
PostMessage(GetShellWindow(), WM_PROGMAN_OPENSHELLSETTINGS, fOptions, 0);
break;
case 7: // Windows 8, 10
ShowFolderOptionsDialog(PAGE_VIEW);
break;
default: