fixes
This commit is contained in:
parent
656e797b00
commit
a48747fa9b
|
@ -1311,7 +1311,7 @@ _FX HWND Gui_CreateWindowExW(
|
||||||
TlsData->gui_hooks_installed = TRUE;
|
TlsData->gui_hooks_installed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Taskbar_SetProcessAppUserModelId();
|
Taskbar_SetProcessAppUserModelId();
|
||||||
}
|
}
|
||||||
|
|
||||||
hwndResult = __sys_CreateWindowExW(
|
hwndResult = __sys_CreateWindowExW(
|
||||||
|
@ -1419,7 +1419,7 @@ _FX HWND Gui_CreateWindowExA(
|
||||||
TlsData->gui_hooks_installed = TRUE;
|
TlsData->gui_hooks_installed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Taskbar_SetProcessAppUserModelId();
|
Taskbar_SetProcessAppUserModelId();
|
||||||
}
|
}
|
||||||
|
|
||||||
hwndResult = __sys_CreateWindowExA(
|
hwndResult = __sys_CreateWindowExA(
|
||||||
|
|
|
@ -500,49 +500,49 @@ _FX WCHAR *Taskbar_CreateAppUserModelId(const WCHAR *AppId)
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
//extern ULONG Dll_Windows;
|
extern ULONG Dll_Windows;
|
||||||
//_FX void Taskbar_SetProcessAppUserModelId(void)
|
_FX void Taskbar_SetProcessAppUserModelId(void)
|
||||||
//{
|
{
|
||||||
// static BOOLEAN _done = FALSE;
|
static BOOLEAN _done = FALSE;
|
||||||
//
|
|
||||||
// P_SetCurrentProcessExplicitAppUserModelID
|
P_SetCurrentProcessExplicitAppUserModelID
|
||||||
// SetCurrentProcessExplicitAppUserModelID;
|
SetCurrentProcessExplicitAppUserModelID;
|
||||||
//
|
|
||||||
// if ((Dll_OsBuild < 7600) || (! Dll_InitComplete))
|
if ((Dll_OsBuild < 7600) || (! Dll_InitComplete))
|
||||||
// return;
|
return;
|
||||||
//
|
|
||||||
// if (Taskbar_SavedAppUserModelId || _done)
|
if (Taskbar_SavedAppUserModelId || _done)
|
||||||
// return;
|
return;
|
||||||
//
|
|
||||||
// //
|
//
|
||||||
// // make sure the necessary function from shell32 is available
|
// make sure the necessary function from shell32 is available
|
||||||
// //
|
//
|
||||||
//// if(Dll_Windows < 10) {
|
// if(Dll_Windows < 10) {
|
||||||
// SetCurrentProcessExplicitAppUserModelID =
|
SetCurrentProcessExplicitAppUserModelID =
|
||||||
// (P_SetCurrentProcessExplicitAppUserModelID) Ldr_GetProcAddrNew(DllName_shell32, L"SetCurrentProcessExplicitAppUserModelID","SetCurrentProcessExplicitAppUserModelID");
|
(P_SetCurrentProcessExplicitAppUserModelID) Ldr_GetProcAddrNew(DllName_shell32, L"SetCurrentProcessExplicitAppUserModelID","SetCurrentProcessExplicitAppUserModelID");
|
||||||
//
|
|
||||||
// // }
|
// }
|
||||||
// /*
|
/*
|
||||||
// else {
|
else {
|
||||||
//
|
|
||||||
// SetCurrentProcessExplicitAppUserModelID = (P_SetCurrentProcessExplicitAppUserModelID)
|
SetCurrentProcessExplicitAppUserModelID = (P_SetCurrentProcessExplicitAppUserModelID)
|
||||||
// GetProcAddress(LoadLibraryW(DllName_shell32),"SetCurrentProcessExplicitAppUserModelID");
|
GetProcAddress(LoadLibraryW(DllName_shell32),"SetCurrentProcessExplicitAppUserModelID");
|
||||||
// }
|
}
|
||||||
// */
|
*/
|
||||||
// if (! SetCurrentProcessExplicitAppUserModelID)
|
if (! SetCurrentProcessExplicitAppUserModelID)
|
||||||
// return;
|
return;
|
||||||
//
|
|
||||||
// //
|
//
|
||||||
// // override AppUserModelId
|
// override AppUserModelId
|
||||||
// //
|
//
|
||||||
//
|
|
||||||
// _done = TRUE;
|
_done = TRUE;
|
||||||
//
|
|
||||||
// if (Taskbar_ShouldOverrideAppUserModelId()) {
|
if (Taskbar_ShouldOverrideAppUserModelId()) {
|
||||||
//
|
|
||||||
// SetCurrentProcessExplicitAppUserModelID(Dll_ImageName);
|
SetCurrentProcessExplicitAppUserModelID(Dll_ImageName);
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
@ -594,12 +594,12 @@ _FX void Taskbar_SetWindowAppUserModelId(HWND hwnd)
|
||||||
// Note: without the right value we may end up with multiple window groups
|
// Note: without the right value we may end up with multiple window groups
|
||||||
// so don't do anythign if we dont have Taskbar_SavedAppUserModelId
|
// so don't do anythign if we dont have Taskbar_SavedAppUserModelId
|
||||||
// see also disabled Taskbar_SetProcessAppUserModelId
|
// see also disabled Taskbar_SetProcessAppUserModelId
|
||||||
if (!Taskbar_SavedAppUserModelId)
|
//if (!Taskbar_SavedAppUserModelId)
|
||||||
return;
|
// return;
|
||||||
|
|
||||||
AppId = Taskbar_SavedAppUserModelId;
|
AppId = Taskbar_SavedAppUserModelId;
|
||||||
//if (! AppId)
|
if (! AppId)
|
||||||
// AppId = Dll_ImageName;
|
AppId = Dll_ImageName;
|
||||||
|
|
||||||
v.vt = VT_BSTR;
|
v.vt = VT_BSTR;
|
||||||
v.bstrVal = Taskbar_AllocBSTR(AppId);
|
v.bstrVal = Taskbar_AllocBSTR(AppId);
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
BOOLEAN Taskbar_Init(HMODULE);
|
BOOLEAN Taskbar_Init(HMODULE);
|
||||||
|
|
||||||
//void Taskbar_SetProcessAppUserModelId(void);
|
void Taskbar_SetProcessAppUserModelId(void);
|
||||||
|
|
||||||
void Taskbar_SetWindowAppUserModelId(HWND hwnd);
|
void Taskbar_SetWindowAppUserModelId(HWND hwnd);
|
||||||
|
|
||||||
|
|
|
@ -183,6 +183,9 @@ void CFileBrowserWindow::OnFileMenu(const QPoint&)
|
||||||
Files.append(BoxedPath);
|
Files.append(BoxedPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Files.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
int iCmd = openShellContextMenu(Files, (void*)this->winId());
|
int iCmd = openShellContextMenu(Files, (void*)this->winId());
|
||||||
if (iCmd == 0)
|
if (iCmd == 0)
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue