[UXTHEME] -Don't change the behaviour of DefWindowProc if SetWindowRgn was called before

This commit is contained in:
Giannis Adamopoulos 2017-11-21 10:51:06 +02:00
parent 4067eb1454
commit 8f98574e1d

View File

@ -268,7 +268,13 @@ int OnPostWinPosChanged(HWND hWnd, WINDOWPOS* pWinPos)
static LRESULT CALLBACK
ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{
if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
PWND_DATA pwndData;
pwndData = (PWND_DATA)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext));
if(!IsAppThemed() ||
!(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT) ||
(pwndData && pwndData->HasAppDefinedRgn))
{
return g_user32ApiHook.DefWindowProcW(hWnd,
Msg,
@ -286,7 +292,13 @@ ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
static LRESULT CALLBACK
ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{
if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT))
PWND_DATA pwndData;
pwndData = (PWND_DATA)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext));
if(!IsAppThemed() ||
!(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT) ||
(pwndData && pwndData->HasAppDefinedRgn))
{
return g_user32ApiHook.DefWindowProcA(hWnd,
Msg,