Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32SS]

Browse source 
- Do not register classes in case of errors at startup.
- Fix desktop background.

svn path=/trunk/; revision=57100
This commit is contained in:
James Tabor 2012-08-18 21:35:35 +00:00
parent 6538f67e55
commit 81198c59dd
2 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/win32ss/user/ntuser/class.c
View file

@ -13,10 +13,10 @@ REGISTER_SYSCLASS DefaultServerClasses[] =
{
{ ((PWSTR)((ULONG_PTR)(WORD)(0x8001))),
CS_GLOBALCLASS|CS_DBLCLKS,
NULL,
0,
NULL, // Use User32 procs
sizeof(ULONG)*2,
(HICON)IDC_ARROW,
(HBRUSH)(COLOR_BACKGROUND + 1),
(HBRUSH)(COLOR_BACKGROUND),
FNID_DESKTOP,
ICLS_DESKTOP
},
@ -47,6 +47,17 @@ REGISTER_SYSCLASS DefaultServerClasses[] =
FNID_SCROLLBAR,
ICLS_SCROLLBAR
},
#if 0
{ ((PWSTR)((ULONG_PTR)(WORD)(0x8006))), // Tooltips
CS_PARENTDC|CS_DBLCLKS,
NULL, // Use User32 procs
0,
(HICON)IDC_ARROW,
0,
FNID_TOOLTIPS,
ICLS_TOOLTIPS
},
#endif
{ ((PWSTR)((ULONG_PTR)(WORD)(0x8004))), // IconTitle is here for now...
0,
NULL, // Use User32 procs
@ -1948,6 +1959,7 @@ UserRegisterSystemClasses(VOID)
WNDCLASSEXW wc;
PCLS Class;
BOOL Ret = TRUE;
HBRUSH hBrush;
DWORD Flags = 0;
if (ppi->W32PF_flags & W32PF_CLASSESREGISTERED)
@ -1992,7 +2004,12 @@ UserRegisterSystemClasses(VOID)
wc.cbWndExtra = DefaultServerClasses[i].ExtraBytes;
wc.hIcon = NULL;
wc.hCursor = DefaultServerClasses[i].hCursor;
wc.hbrBackground = DefaultServerClasses[i].hBrush;
hBrush = DefaultServerClasses[i].hBrush;
if (hBrush <= (HBRUSH)COLOR_MENUBAR)
{
hBrush = IntGetSysColorBrush((INT)hBrush);
}
wc.hbrBackground = hBrush;
wc.lpszMenuName = NULL;
wc.lpszClassName = ClassName.Buffer;
wc.hIconSm = NULL;

24
reactos/win32ss/user/user32/windows/class.c
View file

@ -210,12 +210,6 @@ GetClassInfoExA(
return FALSE;
}
if (!RegisterDefaultClasses)
{
ERR("GetClassInfoExA RegisterSystemControls\n");
RegisterSystemControls();
}
if (IS_ATOM(lpszClass))
{
ClassName.Buffer = (PWSTR)((ULONG_PTR)lpszClass);
@ -230,6 +224,12 @@ GetClassInfoExA(
}
}
if (!RegisterDefaultClasses)
{
ERR("GetClassInfoExA RegisterSystemControls\n");
RegisterSystemControls();
}
Ret = NtUserGetClassInfo(hInstance,
&ClassName,
(LPWNDCLASSEXW)lpwcx,
@ -289,12 +289,6 @@ GetClassInfoExW(
return FALSE;
}
if (!RegisterDefaultClasses)
{
ERR("GetClassInfoExW RegisterSystemControls\n");
RegisterSystemControls();
}
if (IS_ATOM(lpszClass))
{
ClassName.Buffer = (PWSTR)((ULONG_PTR)lpszClass);
@ -305,6 +299,12 @@ GetClassInfoExW(
lpszClass);
}
if (!RegisterDefaultClasses)
{
ERR("GetClassInfoExW RegisterSystemControls\n");
RegisterSystemControls();
}
Ret = NtUserGetClassInfo( hInstance,
&ClassName,
lpwcx,