Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-08 21:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USERINIT]

Browse source 
- Remove two unuseful imports.
- Rewrite StrToColorref to not use shell functions, and increase a bit the size of the szColor buffer in SetUserSysColors to match the capabilities of windows.

svn path=/trunk/; revision=63498
This commit is contained in:
Hermès Bélusca-Maïto 2014-05-29 23:20:31 +00:00
parent 63f0cf2a3a
commit 87026354cb
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/system/userinit/CMakeLists.txt
View file

@ -2,5 +2,5 @@
add_executable(userinit userinit.c userinit.rc)
target_link_libraries(userinit wine)
set_module_type(userinit win32gui UNICODE)
add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll)
add_importlibs(userinit user32 advapi32 shell32 msvcrt kernel32 ntdll)
add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all)

12
reactos/base/system/userinit/userinit.c
View file

@ -227,7 +227,7 @@ StartAutoApplications(
{
if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (findData.nFileSizeHigh || findData.nFileSizeLow))
{
memset(&ExecInfo, 0x0, sizeof(SHELLEXECUTEINFOW));
ZeroMemory(&ExecInfo, sizeof(SHELLEXECUTEINFOW));
ExecInfo.cbSize = sizeof(ExecInfo);
wcscpy(&szPath[len+1], findData.cFileName);
ExecInfo.lpVerb = L"open";
@ -430,11 +430,9 @@ COLORREF StrToColorref(
TRACE("(%s)\n", debugstr_w(lpszCol));
rgb[0] = StrToIntW(lpszCol);
lpszCol = StrChrW(lpszCol, L' ') + 1;
rgb[1] = StrToIntW(lpszCol);
lpszCol = StrChrW(lpszCol, L' ') + 1;
rgb[2] = StrToIntW(lpszCol);
rgb[0] = (BYTE)wcstoul(lpszCol, &lpszCol, 10);
rgb[1] = (BYTE)wcstoul(lpszCol, &lpszCol, 10);
rgb[2] = (BYTE)wcstoul(lpszCol, &lpszCol, 10);
return RGB(rgb[0], rgb[1], rgb[2]);
}
@ -443,7 +441,7 @@ VOID SetUserSysColors(VOID)
{
HKEY hKey;
INT i;
WCHAR szColor[20];
WCHAR szColor[25];
DWORD Type, Size;
COLORREF crColor;
LONG rc;