ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-31 04:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Use the new ShellDimScreen function to fade the background on logoff / shutdown dialogs. CORE-11422 #resolve

Browse Source 
svn path=/trunk/; revision=72573
This commit is contained in:
Mark Jansen
2016-09-04 14:18:41 +00:00
parent 87a716926b
commit 3eb3d2d909
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/shell32/dialogs/dialogs.cpp
+41 -5
View File
@@ -810,6 +810,27 @@ static BOOL ConfirmDialog(HWND hWndOwner, UINT PromptId, UINT TitleId)
return MessageBoxW(hWndOwner, Prompt, Title, MB_YESNO|MB_ICONQUESTION) == IDYES;
}
typedef HRESULT (__stdcall *tShellDimScreen) (IUnknown** Unknown, HWND* hWindow);
BOOL
CallShellDimScreen(IUnknown** pUnknown, HWND* hWindow)
{
static tShellDimScreen ShellDimScreen;
static BOOL Initialized = FALSE;
if (!Initialized)
{
HMODULE mod = LoadLibrary(TEXT("msgina.dll"));
ShellDimScreen = (tShellDimScreen)GetProcAddress(mod, MAKEINTRESOURCEA(16));
Initialized = TRUE;
}
HRESULT hr = E_FAIL;
if (ShellDimScreen)
hr = ShellDimScreen(pUnknown, hWindow);
return SUCCEEDED(hr);
}
/*************************************************************************
* RestartDialogEx [SHELL32.730]
@@ -819,8 +840,13 @@ int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, D
{
TRACE("(%p)\n", hWndOwner);
CComPtr<IUnknown> fadeHandler;
HWND parent;
if (!CallShellDimScreen(&fadeHandler, &parent))
parent = hWndOwner;
/* FIXME: use lpwstrReason */
if (ConfirmDialog(hWndOwner, IDS_RESTART_PROMPT, IDS_RESTART_TITLE))
if (ConfirmDialog(parent, IDS_RESTART_PROMPT, IDS_RESTART_TITLE))
{
HANDLE hToken;
TOKEN_PRIVILEGES npr;
@@ -881,7 +907,12 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM
EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner)
{
DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), hWndOwner, LogOffDialogProc);
CComPtr<IUnknown> fadeHandler;
HWND parent;
if (!CallShellDimScreen(&fadeHandler, &parent))
parent = hWndOwner;
DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), parent, LogOffDialogProc);
return 0;
}
@@ -952,12 +983,17 @@ void WINAPI ExitWindowsDialog(HWND hWndOwner)
TRACE("(%p)\n", hWndOwner);
CComPtr<IUnknown> fadeHandler;
HWND parent;
if (!CallShellDimScreen(&fadeHandler, &parent))
parent = hWndOwner;
/* If the DLL cannot be found for any reason, then it simply uses a
dialog box to ask if the user wants to shut down the computer. */
if(!msginaDll)
{
TRACE("Unable to load msgina.dll.\n");
ExitWindowsDialog_backup(hWndOwner);
ExitWindowsDialog_backup(parent);
return;
}
@@ -966,7 +1002,7 @@ void WINAPI ExitWindowsDialog(HWND hWndOwner)
if(pShellShutdownDialog)
{
/* Actually call the function */
DWORD returnValue = pShellShutdownDialog(hWndOwner, NULL, FALSE);
DWORD returnValue = pShellShutdownDialog(parent, NULL, FALSE);
switch(returnValue)
{
@@ -1019,6 +1055,6 @@ void WINAPI ExitWindowsDialog(HWND hWndOwner)
/* If the function cannot be found, then revert to using the backup solution */
TRACE("Unable to find the 'ShellShutdownDialog' function");
FreeLibrary(msginaDll);
ExitWindowsDialog_backup(hWndOwner);
ExitWindowsDialog_backup(parent);
}
}