mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 14:37:45 +00:00
[0.4.7][NTUSER] Port back minor improvements
0.4.15-dev-3341-g4bc95812fd
defwnd.c Mark default as unreachable. 0.4.15-dev-316-g938df97b54
nonclient.c NC_IconForWindow(): Remove redundant if() (#2842) and: -defwnd.c: delete a malformed TRACE() which had a format string, but no argument. -sysparams.c: A single line from 0.4.14-dev-676-g9ce12f0b4c
avoiding a wcslen() call in SpiLoadTimeOut()
This commit is contained in:
parent
d85a921c6f
commit
213680fe3c
|
@ -414,7 +414,6 @@ UserPaintCaption(PWND pWnd, INT Flags)
|
||||||
* RealUserDrawCaption in order to draw the classic caption when themes
|
* RealUserDrawCaption in order to draw the classic caption when themes
|
||||||
* are disabled but the themes service is enabled
|
* are disabled but the themes service is enabled
|
||||||
*/
|
*/
|
||||||
TRACE("UDCB Flags %08x\n");
|
|
||||||
co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCUAHDRAWCAPTION, Flags, 0);
|
co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCUAHDRAWCAPTION, Flags, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -486,8 +485,7 @@ DefWndGetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
|
||||||
case ICON_SMALL2:
|
case ICON_SMALL2:
|
||||||
hIconRet = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE);
|
hIconRet = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE);
|
||||||
break;
|
break;
|
||||||
default:
|
DEFAULT_UNREACHABLE;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return (LRESULT)hIconRet;
|
return (LRESULT)hIconRet;
|
||||||
}
|
}
|
||||||
|
|
|
@ -626,7 +626,7 @@ PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND pWnd )
|
||||||
// it does not use the default icon! And it does not check for DS_MODALFRAME.
|
// it does not use the default icon! And it does not check for DS_MODALFRAME.
|
||||||
if (!hIcon && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME))
|
if (!hIcon && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME))
|
||||||
{
|
{
|
||||||
if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small
|
hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small
|
||||||
if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size.
|
if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size.
|
||||||
}
|
}
|
||||||
if (hIcon)
|
if (hIcon)
|
||||||
|
|
|
@ -93,8 +93,6 @@ static const WCHAR* KEY_KDBPREF = L"Control Panel\\Accessibility\\Keyboard Prefe
|
||||||
static const WCHAR* KEY_SCRREAD = L"Control Panel\\Accessibility\\Blind Access";
|
static const WCHAR* KEY_SCRREAD = L"Control Panel\\Accessibility\\Blind Access";
|
||||||
static const WCHAR* VAL_ON = L"On";
|
static const WCHAR* VAL_ON = L"On";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** Loading the settings ******************************************************/
|
/** Loading the settings ******************************************************/
|
||||||
|
|
||||||
static
|
static
|
||||||
|
@ -146,7 +144,7 @@ SpiLoadTimeOut(VOID)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (wcslen(szApplicationName) == 0) return 0;
|
if (szApplicationName[0] == 0) return 0;
|
||||||
return SpiLoadInt(KEY_DESKTOP, VAL_SCRTO, 0);
|
return SpiLoadInt(KEY_DESKTOP, VAL_SCRTO, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue